commit 6182f60f758f85a214a7e84d76f6fddb2bffd730 Merge: e8683bcbb d2951b381 Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 24 08:51:55 2018 -0400

Merge branch 'maint-0.3.2' into maint-0.3.3

changes/bug23693.1 | 4 ++++ src/or/config.c | 12 ++++++++++-- src/or/main.c | 2 +- src/or/router.c | 21 ++++++++++++++------- 4 files changed, 29 insertions(+), 10 deletions(-)

diff --cc src/or/config.c index 986794cec,79cfcb411..cf2f58498 --- a/src/or/config.c +++ b/src/or/config.c @@@ -4739,19 -4656,22 +4746,20 @@@ static in options_transition_affects_workers(const or_options_t *old_options, const or_options_t *new_options) { - if (!opt_streq(old_options->DataDirectory, new_options->DataDirectory) || - old_options->NumCPUs != new_options->NumCPUs || - !config_lines_eq(old_options->ORPort_lines, new_options->ORPort_lines) || - old_options->ServerDNSSearchDomains != - new_options->ServerDNSSearchDomains || - old_options->SafeLogging_ != new_options->SafeLogging_ || - old_options->ClientOnly != new_options->ClientOnly || - server_mode(old_options) != server_mode(new_options) || - dir_server_mode(old_options) != dir_server_mode(new_options) || + YES_IF_CHANGED_STRING(DataDirectory); + YES_IF_CHANGED_INT(NumCPUs); + YES_IF_CHANGED_LINELIST(ORPort_lines); + YES_IF_CHANGED_BOOL(ServerDNSSearchDomains); + YES_IF_CHANGED_BOOL(SafeLogging_); + YES_IF_CHANGED_BOOL(ClientOnly); + YES_IF_CHANGED_BOOL(LogMessageDomains); + YES_IF_CHANGED_LINELIST(Logs); + + if (server_mode(old_options) != server_mode(new_options) || - public_server_mode(old_options) != public_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) ++ dir_server_mode(old_options) != dir_server_mode(new_options)) return 1;

- /* Check whether log options match. */ - /* Nothing that changed matters. */ return 0; }