summaryrefslogtreecommitdiff
path: root/src/or/directory.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-05-09 13:37:56 -0400
committerNick Mathewson <nickm@torproject.org>2011-05-09 13:37:56 -0400
commit09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57 (patch)
tree09125cf5f4fb3e20709d6c39f78e419791db67d7 /src/or/directory.c
parent0b3166fffa0e5e19c63fd95538f87d634444d28c (diff)
parentcd42ae71850985ed8dd34ae73dc6265a643fcb13 (diff)
downloadtor-09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57.tar.gz
tor-09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57.zip
Merge remote-tracking branch 'public/bug3022_v2' into maint-0.2.2
Diffstat (limited to 'src/or/directory.c')
-rw-r--r--src/or/directory.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c
index 0c095fe871..68734e6042 100644
--- a/src/or/directory.c
+++ b/src/or/directory.c
@@ -353,6 +353,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose,
break;
case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS:
type = V2_AUTHORITY;
+ prefer_authority = 1; /* Only v2 authorities have these anyway. */
break;
case DIR_PURPOSE_FETCH_SERVERDESC:
type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY :