nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-10 21:23:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'bug1810' into maint-0.2.2

Browse Source
This commit is contained in:
Roger Dingledine 2011-05-21 16:09:55 -04:00
commit 0235fe34d2
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
changes/bug1810 Normal file
View File

@ -0,0 +1,6 @@
o Major bugfixes:
- Don't decide to make a new descriptor when receiving a HUP signal.
This bug has caused a lot of relays to disappear from the consensus
periodically. Fixes the most common case of triggering bug 1810;
bugfix on 0.2.2.7-alpha.

2
src/or/config.c
View File

@ -3809,7 +3809,7 @@ options_transition_affects_workers(or_options_t *old_options,
old_options->ORPort != new_options->ORPort ||
old_options->ServerDNSSearchDomains !=
new_options->ServerDNSSearchDomains ||
old_options->SafeLogging != new_options->SafeLogging ||
old_options->_SafeLogging != new_options->_SafeLogging ||
old_options->ClientOnly != new_options->ClientOnly ||
public_server_mode(old_options) != public_server_mode(new_options) ||
!config_lines_eq(old_options->Logs, new_options->Logs) ||