diff options
author | Roger Dingledine <arma@torproject.org> | 2011-05-21 16:09:55 -0400 |
---|---|---|
committer | Roger Dingledine <arma@torproject.org> | 2011-05-21 16:09:55 -0400 |
commit | 0235fe34d2c915f46933ead253192b042c713af0 (patch) | |
tree | 49eac222284c1587bf8d7dbb540002f8ed0b97d1 /src | |
parent | a2851d303414bbbdff97a02d142275c3e7c71841 (diff) | |
parent | 3ff7925a7027b81cb9f14b0863972b4d4e5b46a4 (diff) | |
download | tor-0235fe34d2c915f46933ead253192b042c713af0.tar.gz tor-0235fe34d2c915f46933ead253192b042c713af0.zip |
Merge branch 'bug1810' into maint-0.2.2
Diffstat (limited to 'src')
-rw-r--r-- | src/or/config.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c index 68a6b29f16..36fb991e33 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -3809,7 +3809,7 @@ options_transition_affects_workers(or_options_t *old_options, old_options->ORPort != new_options->ORPort || old_options->ServerDNSSearchDomains != new_options->ServerDNSSearchDomains || - old_options->SafeLogging != new_options->SafeLogging || + old_options->_SafeLogging != new_options->_SafeLogging || old_options->ClientOnly != new_options->ClientOnly || public_server_mode(old_options) != public_server_mode(new_options) || !config_lines_eq(old_options->Logs, new_options->Logs) || |