summaryrefslogtreecommitdiff
path: root/src/or/config.c
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
commit7c59c751b05ff1195538d2d4bd8cb4ff8ea1885e (patch)
treed44eb093d209e2c6c491789d12e532daa8020ee1 /src/or/config.c
parent5bee5fbac71f3534b8e1a19c742c2a61f686ca9d (diff)
parent5a21b27083640aec1e23e21cdfcad02625659e05 (diff)
downloadtor-7c59c751b05ff1195538d2d4bd8cb4ff8ea1885e.tar.gz
tor-7c59c751b05ff1195538d2d4bd8cb4ff8ea1885e.zip
Merge branch 'maint-0.3.1' into maint-0.3.2
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 b123d49358..e7fe3a5470 100644
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -4654,6 +4654,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)