summaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorRoger Dingledine <arma@torproject.org>2011-05-21 18:14:16 -0400
committerRoger Dingledine <arma@torproject.org>2011-05-21 18:14:16 -0400
commitcb7fff193e2749f241e646b155de3ee33623606e (patch)
tree1bd49920602d8bae116cf8408248bbb19a926ea8 /src/or/config.c
parent0a4649e6576cacc07c215c481fd1c500cd563a3b (diff)
parent0e8949a8fae721e856eebbb4fe401484e3acf45f (diff)
downloadtor-cb7fff193e2749f241e646b155de3ee33623606e.tar.gz
tor-cb7fff193e2749f241e646b155de3ee33623606e.zip
Merge branch 'maint-0.2.2'
Diffstat (limited to 'src/or/config.c')
-rw-r--r--src/or/config.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/or/config.c b/src/or/config.c
index 016f831b83..3493abf71c 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -3896,7 +3896,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) ||