diff options
| author | Alexander Færøy <ahf@torproject.org> | 2020-06-30 14:23:41 +0000 |
|---|---|---|
| committer | Alexander Færøy <ahf@torproject.org> | 2020-06-30 14:23:41 +0000 |
| commit | dbb70d85bf65d33e0a1035146d71a2a610e91056 (patch) | |
| tree | 17e41f6f0c61dbb0794a0c7da9ca77467f915cdf | |
| parent | 881f50a9a98102a4540575713b621652f108aef1 (diff) | |
| parent | 8697205be400e560c7ae4083d7febd7aa593e61a (diff) | |
| download | tor-dbb70d85bf65d33e0a1035146d71a2a610e91056.tar.gz tor-dbb70d85bf65d33e0a1035146d71a2a610e91056.zip | |
Merge branch 'maint-0.3.5' into maint-0.4.2
| -rw-r--r-- | changes/bug34303 | 5 | ||||
| -rw-r--r-- | src/core/or/circuitlist.c | 2 | ||||
| -rw-r--r-- | src/feature/client/entrynodes.c | 8 |
3 files changed, 13 insertions, 2 deletions
diff --git a/changes/bug34303 b/changes/bug34303 new file mode 100644 index 0000000000..dce57f4646 --- /dev/null +++ b/changes/bug34303 @@ -0,0 +1,5 @@ + o Minor bugfixes (client performance): + - Resume being willing to use preemptively-built circuits when + UseEntryGuards is set to 0. We accidentally disabled this feature + with that config setting, leading to slower load times. Fixes bug + 34303; bugfix on 0.3.3.2-alpha. diff --git a/src/core/or/circuitlist.c b/src/core/or/circuitlist.c index 61bcfa9039..4102cf3d4c 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -1938,7 +1938,7 @@ circuit_find_to_cannibalize(uint8_t purpose_to_produce, extend_info_t *info, } /* Ignore any circuits for which we can't use the Guard. It is possible - * that the Guard was removed from the samepled set after the circuit + * that the Guard was removed from the sampled set after the circuit * was created so avoid using it. */ if (!entry_guard_could_succeed(circ->guard_state)) { goto next; diff --git a/src/feature/client/entrynodes.c b/src/feature/client/entrynodes.c index 537ead020b..115d871843 100644 --- a/src/feature/client/entrynodes.c +++ b/src/feature/client/entrynodes.c @@ -3452,10 +3452,16 @@ entry_guards_update_state(or_state_t *state) entry_guards_dirty = 0; } -/** Return true iff the circuit's guard can succeed that is can be used. */ +/** Return true iff the circuit's guard can succeed, that is, can be used. */ int entry_guard_could_succeed(const circuit_guard_state_t *guard_state) { + if (get_options()->UseEntryGuards == 0) { + /* we're fine with this circuit's first hop, because we're not + * configured to use entry guards. */ + return 1; + } + if (!guard_state) { return 0; } |