summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2007-12-12 04:46:16 +0000
committerRoger Dingledine <arma@torproject.org>2007-12-12 04:46:16 +0000
commit40efd7d47b923c6fdd807b0eec5021d4946c3588 (patch)
tree13fb06873c1b758f9cf0d934547ec77c324792d5 /src/or/config.c
parent3b2dd8d7632b22f7667c6ab163daaafee3f9aab6 (diff)
downloadtor-40efd7d47b923c6fdd807b0eec5021d4946c3588.tar.gz
tor-40efd7d47b923c6fdd807b0eec5021d4946c3588.zip
but don't disable all the default v1 authorities quite yet
svn:r12778
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/or/config.c b/src/or/config.c
index fc5bdf1f4d..f4d245117f 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -889,7 +889,7 @@ consider_adding_dir_authorities(or_options_t *options,
{
config_line_t *cl;
int need_to_update =
- !smartlist_len(router_get_trusted_dir_servers()) ||
+ !smartlist_len(router_get_trusted_dir_servers()) || !old_options ||
!config_lines_eq(options->DirServers, old_options->DirServers) ||
!config_lines_eq(options->AlternateBridgeAuthority,
old_options->AlternateBridgeAuthority) ||
@@ -910,7 +910,7 @@ consider_adding_dir_authorities(or_options_t *options,
if (!options->AlternateBridgeAuthority)
type |= BRIDGE_AUTHORITY;
if (!options->AlternateDirAuthority)
- type |= V2_AUTHORITY | V3_AUTHORITY;
+ type |= V1_AUTHORITY | V2_AUTHORITY | V3_AUTHORITY;
if (!options->AlternateHSAuthority)
type |= HIDSERV_AUTHORITY;
add_default_trusted_dir_authorities(type);