Merge branch 'maint-0.3.0'

This commit is contained in:
Nick Mathewson
2017-02-17 11:47:49 -05:00
2 changed files with 5 additions and 1 deletions
-1
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 ||