diff options
| author | Roger Dingledine <arma@torproject.org> | 2007-12-09 03:38:57 +0000 |
|---|---|---|
| committer | Roger Dingledine <arma@torproject.org> | 2007-12-09 03:38:57 +0000 |
| commit | 9b162ef4302881de7c8da7712fedbdd6da9c95df (patch) | |
| tree | 53e095d3a4d3f2c1f2c781fe1bc65e06e3d3c2a3 /src/or/config.c | |
| parent | 6bf8e8aec397441d5b46ad2d2f75827ff2e7df9e (diff) | |
| download | tor-9b162ef4302881de7c8da7712fedbdd6da9c95df.tar.gz tor-9b162ef4302881de7c8da7712fedbdd6da9c95df.zip | |
only clear the bridge list if options->Bridges is set.
this doesn't matter yet so we aren't adding them in other
ways yet.
svn:r12730
Diffstat (limited to 'src/or/config.c')
| -rw-r--r-- | src/or/config.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/or/config.c b/src/or/config.c index 6e39a96c12..d37bb64f76 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -986,8 +986,8 @@ options_act(or_options_t *old_options) add_default_trusted_dirservers(); } - clear_bridge_list(); if (options->Bridges) { + clear_bridge_list(); for (cl = options->Bridges; cl; cl = cl->next) { if (parse_bridge_line(cl->value, 0)<0) { log_warn(LD_BUG, @@ -1026,7 +1026,7 @@ options_act(or_options_t *old_options) /* Bail out at this point if we're not going to be a client or server: * we want to not fork, and to log stuff to stderr. */ - if (options->command != CMD_RUN_TOR) + if (!running_tor) return 0; { @@ -1079,9 +1079,6 @@ options_act(or_options_t *old_options) if (accounting_is_enabled(options)) configure_accounting(time(NULL)); - if (!running_tor) - return 0; - /* Check for transitions that need action. */ if (old_options) { if (options->UseEntryGuards && !old_options->UseEntryGuards) { |