commit 823fb68a14b551fc1f40e904428b3e31732441c5 Author: Nick Mathewson nickm@torproject.org Date: Fri Feb 17 11:46:38 2017 -0500

Remove a redundant check in ..transition_affects_guards()

scan-build found that we we checking UseEntryGuards twice.

Fixes bug 21492. --- changes/bug21492 | 5 +++++ src/or/config.c | 1 - 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/changes/bug21492 b/changes/bug21492 new file mode 100644 index 0000000..2ed7947 --- /dev/null +++ b/changes/bug21492 @@ -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. + diff --git a/src/or/config.c b/src/or/config.c index e979930..a527571 100644 --- a/src/or/config.c +++ b/src/or/config.c @@ -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 ||