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

Merge branch 'maint-0.3.0'

Browse Source
This commit is contained in:
Nick Mathewson 2017-02-17 11:47:49 -05:00
commit efa5bbaba0
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
changes/bug21492 Normal file
View File

@ -0,0 +1,5 @@
o Minor bugfixes (correctness):
- Remove a redundant check for the UseEntryGuards option from the
options_transition_affects_guards() function. Fixes bug 21492;
bugfix on 0.3.0.1-alpha.

1
src/or/config.c
View File

@ -1587,7 +1587,6 @@ options_transition_affects_guards(const or_options_t *old,
return
(old->UseEntryGuards != new->UseEntryGuards ||
old->UseBridges != new->UseBridges ||
old->UseEntryGuards != new->UseEntryGuards ||
old->ClientUseIPv4 != new->ClientUseIPv4 ||
old->ClientUseIPv6 != new->ClientUseIPv6 ||
old->FascistFirewall != new->FascistFirewall ||