diff options
| author | George Kadianakis <desnacked@riseup.net> | 2020-06-02 14:05:33 +0300 |
|---|---|---|
| committer | George Kadianakis <desnacked@riseup.net> | 2020-06-02 14:05:33 +0300 |
| commit | 6b05d447bb5ee8512b33ed2f78223e02c6455096 (patch) | |
| tree | 74bc02e50d0f83b199899d14f175420c34175368 | |
| parent | 688d1b3f032b5a84ad5ada23fa8831c07bd76c75 (diff) | |
| parent | 39f2411b3f5ab1a50c74fdafb432d5286c451ab7 (diff) | |
| download | tor-6b05d447bb5ee8512b33ed2f78223e02c6455096.tar.gz tor-6b05d447bb5ee8512b33ed2f78223e02c6455096.zip | |
Merge branch 'tor-github/pr/1909' into maint-0.4.3
| -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 2120c1e85d..96cc718029 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -1943,7 +1943,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 749d8881f0..148e6471ba 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; } |