diff options
| author | Nick Mathewson <nickm@torproject.org> | 2017-02-17 11:47:49 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2017-02-17 11:47:49 -0500 |
| commit | efa5bbaba07d20d1aacff7d1d2a5fe08a6ec2d72 (patch) | |
| tree | d0445d1f3ffd0d83cbdb9b260279d23bb4856dfd | |
| parent | 9b1d99018bdc0a52e9342afa0cf812adcfa055db (diff) | |
| parent | 823fb68a14b551fc1f40e904428b3e31732441c5 (diff) | |
| download | tor-efa5bbaba07d20d1aacff7d1d2a5fe08a6ec2d72.tar.gz tor-efa5bbaba07d20d1aacff7d1d2a5fe08a6ec2d72.zip | |
Merge branch 'maint-0.3.0'
| -rw-r--r-- | changes/bug21492 | 5 | ||||
| -rw-r--r-- | src/or/config.c | 1 |
2 files changed, 5 insertions, 1 deletions
diff --git a/changes/bug21492 b/changes/bug21492 new file mode 100644 index 0000000000..2ed7947771 --- /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 e979930b10..a527571cb0 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 || |