summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-31 11:43:14 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-31 11:43:14 -0400
commit5a21b27083640aec1e23e21cdfcad02625659e05 (patch)
tree0c995b9687936a1081d1db5174bc5fa8d4fac0f6 /src
parent7c2f688fb9b73c2aba6df9bd8792487e8d96cecc (diff)
parentf2e23d38ab109ea8d5be0d6b9e9edad4528ff68a (diff)
downloadtor-5a21b27083640aec1e23e21cdfcad02625659e05.tar.gz
tor-5a21b27083640aec1e23e21cdfcad02625659e05.zip
Merge branch 'maint-0.3.0' into maint-0.3.1
Diffstat (limited to 'src')
-rw-r--r--src/or/config.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c
index c13985543a..429d51f3d1 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4492,6 +4492,7 @@ options_transition_affects_workers(const or_options_t *old_options,
new_options->ServerDNSSearchDomains ||
old_options->SafeLogging_ != new_options->SafeLogging_ ||
old_options->ClientOnly != new_options->ClientOnly ||
+ server_mode(old_options) != server_mode(new_options) ||
public_server_mode(old_options) != public_server_mode(new_options) ||
!config_lines_eq(old_options->Logs, new_options->Logs) ||
old_options->LogMessageDomains != new_options->LogMessageDomains)