diff options
| author | Roger Dingledine <arma@torproject.org> | 2010-04-03 22:05:02 -0400 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2010-04-03 22:05:02 -0400 |
| commit | 8aec982f910f918785158038e5afafe55f869372 (patch) | |
| tree | 30afce1131f4b0b84645e46f8ae92de45c591676 /src | |
| parent | 7b3cd4dceb59aece863528b13d8eda19df6480a8 (diff) | |
| parent | 0324d3b0ec6d8ee0ec24c2e93915c9aa70e1665d (diff) | |
| download | tor-8aec982f910f918785158038e5afafe55f869372.tar tor-8aec982f910f918785158038e5afafe55f869372.tar.gz | |
Merge branch 'maint-0.2.1'
Conflicts:
ChangeLog
configure.in
contrib/tor-mingw.nsi.in
src/win32/orconfig.h
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/directory.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/or/directory.c b/src/or/directory.c index 39e67c957..52e1c392c 100644 --- a/src/or/directory.c +++ b/src/or/directory.c @@ -130,6 +130,8 @@ authority_type_to_string(authority_type_t auth) smartlist_add(lst, (void*)"V1"); if (auth & V2_AUTHORITY) smartlist_add(lst, (void*)"V2"); + if (auth & V3_AUTHORITY) + smartlist_add(lst, (void*)"V3"); if (auth & BRIDGE_AUTHORITY) smartlist_add(lst, (void*)"Bridge"); if (auth & HIDSERV_AUTHORITY) @@ -311,12 +313,14 @@ directory_get_from_dirserver(uint8_t dir_purpose, uint8_t router_purpose, case DIR_PURPOSE_FETCH_EXTRAINFO: type = EXTRAINFO_CACHE | (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V2_AUTHORITY); + V3_AUTHORITY); break; case DIR_PURPOSE_FETCH_V2_NETWORKSTATUS: + type = V2_AUTHORITY; + break; case DIR_PURPOSE_FETCH_SERVERDESC: type = (router_purpose == ROUTER_PURPOSE_BRIDGE ? BRIDGE_AUTHORITY : - V2_AUTHORITY); + V3_AUTHORITY); break; case DIR_PURPOSE_FETCH_RENDDESC: type = HIDSERV_AUTHORITY; |