diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-10-02 11:11:30 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-10-02 11:11:30 -0400 |
| commit | c50c98ba6a3eae0b9a3a19c4a3498809080d7ac0 (patch) | |
| tree | e5e2ebf637d844996695799d8d1630624363e610 /src | |
| parent | 2c93be80d9ad0712b5716c85e32f7a5184f3b1d2 (diff) | |
| download | tor-c50c98ba6a3eae0b9a3a19c4a3498809080d7ac0.tar.gz tor-c50c98ba6a3eae0b9a3a19c4a3498809080d7ac0.zip | |
Make changes in server_mode() affect workers; fix a crash.
Without this fix, changes from client to bridge don't trigger
transition_affects_workers(), so we would never have actually
initialized the cpuworkers.
Fixes bug 23693. Bugfix on 3bcdb26267502e0 0.2.6.3-alpha, which
fixed bug 14901 in the general case, but not on the case where
public_server_mode() did not change.
Diffstat (limited to 'src')
| -rw-r--r-- | src/or/config.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/or/config.c b/src/or/config.c index 2e001ee5ab..23c566c6ca 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -4453,6 +4453,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) |