diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-31 11:43:14 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-31 11:43:14 -0400 |
| commit | fecc5c61fc647fd2a87c2e5b999e139c0b11e29c (patch) | |
| tree | 868bde63831e3838d7529200e2422f06db58281b | |
| parent | e1af8fd61757fa50380111b047219e942935a2c5 (diff) | |
| parent | 04d4786cc40b2d80b4cd34e7d5339b0100861c8f (diff) | |
| download | tor-fecc5c61fc647fd2a87c2e5b999e139c0b11e29c.tar.gz tor-fecc5c61fc647fd2a87c2e5b999e139c0b11e29c.zip | |
Merge branch 'maint-0.2.9' into release-0.2.9
| -rw-r--r-- | changes/bug23693 | 6 | ||||
| -rw-r--r-- | src/or/config.c | 1 |
2 files changed, 7 insertions, 0 deletions
diff --git a/changes/bug23693 b/changes/bug23693 new file mode 100644 index 0000000000..796398be51 --- /dev/null +++ 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 index 08cc5cdf57..1aeff462ed 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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) |