[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm@xxxxxxxxxxxxxx]

commit e6980faec43504ac32ddd96d9c2bddcccca3a21b
Merge: acd6a48 09d7af7
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Mon May 9 13:39:51 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'
    
    Conflicts:
    	src/or/directory.c

 changes/bug3022        |    6 ++++++
 doc/tor.1.txt          |    6 ++++++
 src/or/config.c        |    1 +
 src/or/directory.c     |    1 +
 src/or/networkstatus.c |    2 +-
 src/or/or.h            |    4 +++-
 6 files changed, 18 insertions(+), 2 deletions(-)

diff --cc src/or/directory.c
index 145de3d,68734e6..313c6c5
--- a/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:

_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits