Merge remote-tracking branch 'origin/maint-0.2.2'

Conflicts:
	src/or/directory.c

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/or/config.c
Simple merge

diff --cc src/or/directory.c
index 145de3d750692c00aa22b636d6f753ca517cdd89,68734e60426a7fc2cb155c2fe04f1a82c72b4d51..313c6c5a402bc810f8f22329fafdeee5a1e44e04
--- 1/src/or/directory.c
--- 2/src/or/directory.c
+++ b/src/or/directory.c
@@@ -357,19 -347,20 +357,20 @@@ directory_get_from_dirserver(uint8_t di
     * it elsewhere in directory.c. -RD */
    switch (dir_purpose) {
      case DIR_PURPOSE_FETCH_EXTRAINFO:
 -      type = EXTRAINFO_CACHE |
 -             (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY :
 -                                                        V3_AUTHORITY);
 +      type = EXTRAINFO_DIRINFO |
 +             (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO :
 +                                                        V3_DIRINFO);
        break;
      case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS:
 -      type = V2_AUTHORITY;
 +      type = V2_DIRINFO;
+       prefer_authority = 1; /* Only v2 authorities have these anyway. */
        break;
      case DIR_PURPOSE_FETCH_SERVERDESC:
 -      type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY :
 -                                                        V3_AUTHORITY);
 +      type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_DIRINFO :
 +                                                        V3_DIRINFO);
        break;
      case DIR_PURPOSE_FETCH_RENDDESC:
 -      type = HIDSERV_AUTHORITY;
 +      type = HIDSERV_DIRINFO;
        break;
      case DIR_PURPOSE_FETCH_STATUS_VOTE:
      case DIR_PURPOSE_FETCH_DETACHED_SIGNATURES:

diff --cc src/or/networkstatus.c
Simple merge

diff --cc src/or/or.h
Simple merge