Commit 04d4786c authored by Nick Mathewson's avatar Nick Mathewson 🤹
Browse files

Merge remote-tracking branch 'public/bug23693_029' into maint-0.2.9

parents 151d5ede c50c98ba

changes/bug23693

0 → 100644
+6 −0
Original line number Diff line number Diff line 
  o Minor bugfixes (relay, crash):

    - Avoid a crash when transitioning from client mode to bridge mode.

      Previously, we would launch the worker threads whenever our "public

      server" mode changed, but not when our "server" mode changed.

      Fixes bug 23693; bugfix on 0.2.6.3-alpha.

src/or/config.c

+1 −0
Original line number Diff line number Diff line
@@ -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)