aboutsummaryrefslogtreecommitdiff
path: root/src/or/config.c
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-10-31 11:43:07 -0400
committerNick Mathewson <nickm@torproject.org>2017-10-31 11:43:07 -0400
commit04d4786cc40b2d80b4cd34e7d5339b0100861c8f (patch)
treee47bdc3c61f3888ffddce367f35c42417c2569a4 /src/or/config.c
parent151d5ededf9fb334a5195904945f95cf626f51bc (diff)
parentc50c98ba6a3eae0b9a3a19c4a3498809080d7ac0 (diff)
downloadtor-04d4786cc40b2d80b4cd34e7d5339b0100861c8f.tar.gz
tor-04d4786cc40b2d80b4cd34e7d5339b0100861c8f.zip
Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9
Diffstat (limited to 'src/or/config.c')
-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 08cc5cdf57..1aeff462ed 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4456,6 +4456,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)