diff options
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/or/config.c b/src/or/config.c index a044115ea..052a62668 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -477,7 +477,7 @@ static config_var_description_t options_description[] = { "and servers." }, { "ORListenAddress", "Bind to this address to listen for connections from " "clients and servers, instead of the default 0.0.0.0:ORPort." }, - { "PublishServerDescriptors", "Set to \"\" to keep the server from " + { "PublishServerDescriptor", "Set to \"\" to keep the server from " "uploading info to the directory authorities." }, /*{ "RedirectExit", "When an outgoing connection tries to connect to a " *"given address, redirect it to another address instead." }, @@ -963,8 +963,8 @@ options_act(or_options_t *old_options) int running_tor = options->command == CMD_RUN_TOR; char *msg; - clear_trusted_dir_servers(); if (options->DirServers) { + clear_trusted_dir_servers(); for (cl = options->DirServers; cl; cl = cl->next) { if (parse_dir_server_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -973,7 +973,8 @@ options_act(or_options_t *old_options) } } } else { - add_default_trusted_dirservers(); + if (!router_get_trusted_dir_servers()) + add_default_trusted_dirservers(); } clear_bridge_list(); |