tor

commit 7c59c751b05ff1195538d2d4bd8cb4ff8ea1885e
parent 5bee5fbac71f3534b8e1a19c742c2a61f686ca9d
Author: Nick Mathewson <nickm@torproject.org>
Date:   Tue, 31 Oct 2017 11:43:14 -0400

Merge branch 'maint-0.3.1' into maint-0.3.2

Diffstat:
A
changes/bug23693
 | 
6
++++++
M
src/or/config.c
 | 
1
+

2 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/changes/bug23693 b/changes/bug23693
@@ -0,0 +1,6 @@
+  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.
+
diff --git 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)