aboutsummaryrefslogtreecommitdiff
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
commitf2e23d38ab109ea8d5be0d6b9e9edad4528ff68a (patch)
tree014b0000eb350f88f668a4616f7f63b7cd9fca2a /src
parent6ce8cc5dbba52c2a5e60d4311e8b9cfe684f210e (diff)
parent04d4786cc40b2d80b4cd34e7d5339b0100861c8f (diff)
downloadtor-f2e23d38ab109ea8d5be0d6b9e9edad4528ff68a.tar.gz
tor-f2e23d38ab109ea8d5be0d6b9e9edad4528ff68a.zip
Merge branch 'maint-0.2.9' into maint-0.3.0
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 cc22ce2f0b..31c3fe3308 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4540,6 +4540,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)