diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:39:51 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-05-09 13:39:51 -0400 |
| commit | e6980faec43504ac32ddd96d9c2bddcccca3a21b (patch) | |
| tree | aea893d8370deabe147299cb192b7967f1a7ece9 /src/or/directory.c | |
| parent | acd6a4856bccff92eb241b18066ca7df577ab5f2 (diff) | |
| parent | 09d7af7789d1b5cd1fdad59fc7eafa7748b4bb57 (diff) | |
| download | tor-e6980faec43504ac32ddd96d9c2bddcccca3a21b.tar.gz tor-e6980faec43504ac32ddd96d9c2bddcccca3a21b.zip | |
Merge remote-tracking branch 'origin/maint-0.2.2'
Conflicts:
src/or/directory.c
Diffstat (limited to 'src/or/directory.c')
| -rw-r--r-- | src/or/directory.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 145de3d750..313c6c5a40 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -363,6 +363,7 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: 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_DIRINFO : |