Merge branch 'maint-0.3.2' into maint-0.3.3

diff --cc src/or/config.c
index 986794cec5faaab3dfed282cf7c7f26e8285fc30,79cfcb411144793ce7ceafbeb65278d726af95b5..cf2f58498078523cff75207db21dafa80383c183
--- 1/src/or/config.c
--- 2/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;
  }

diff --cc src/or/main.c
Simple merge

diff --cc src/or/router.c
Simple merge