June 2020 - tor-commits - lists.torproject.org

[tor/master] Merge branch 'maint-0.4.3' into maint-0.4.4
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 9638c6d7a7c9de5336eab16eb013f97a62c75022 Merge: 0d5152fc5 322abd4fd Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:41 2020 +0000 Merge branch 'maint-0.4.3' into maint-0.4.4

1 0

[tor/release-0.3.5] Merge branch 'tor-github/pr/1909' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:17 2020 +0000 Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303 | 5 +++++ src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/master] Merge branch 'maint-0.4.4'
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 081d84c1de4cbf44bcac7afa0ab7417728052946 Merge: 90c313e87 9638c6d7a Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:41 2020 +0000 Merge branch 'maint-0.4.4'

1 0

[tor/release-0.4.2] Preemptive circs should work with UseEntryGuards 0
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 39f2411b3f5ab1a50c74fdafb432d5286c451ab7 Author: Roger Dingledine <arma(a)torproject.org> Date: Sat May 30 01:54:22 2020 -0400 Preemptive circs should work with UseEntryGuards 0 Resume being willing to use preemptively-built circuits when UseEntryGuards is set to 0. We accidentally disabled this feature with that config setting (in our fix for #24469), leading to slower load times. Fixes bug 34303; bugfix on 0.3.3.2-alpha. --- changes/bug34303 | 5 +++++ src/core/or/circuitlist.c | 2 +- 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 000000000..dce57f464 --- /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 be5ac3b7f..03d495cdf 100644 --- a/src/core/or/circuitlist.c +++ b/src/core/or/circuitlist.c @@ -1883,7 +1883,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 7c2159ce8..8d9230b66 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; }

1 0

[tor/release-0.4.2] Merge branch 'tor-github/pr/1909' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:17 2020 +0000 Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303 | 5 +++++ src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.2
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit dbb70d85bf65d33e0a1035146d71a2a610e91056 Merge: 881f50a9a 8697205be Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:41 2020 +0000 Merge branch 'maint-0.3.5' into maint-0.4.2 changes/bug34303 | 5 +++++ src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.3.5] Merge branch 'maint-0.3.5' into release-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 34ca6b133710d3d2ac75debcbc4005585a2c2656 Merge: 62727a4ad 8697205be Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:41 2020 +0000 Merge branch 'maint-0.3.5' into release-0.3.5 changes/bug34303 | 5 +++++ src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'tor-github/pr/1909' into maint-0.3.5
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 8697205be400e560c7ae4083d7febd7aa593e61a Merge: 8444fbe90 39f2411b3 Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:17 2020 +0000 Merge branch 'tor-github/pr/1909' into maint-0.3.5 changes/bug34303 | 5 +++++ src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit be17fa169321d2c69618d4636ac5e1f1fc3a4cb8 Merge: ff4bd6699 322abd4fd Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:41 2020 +0000 Merge branch 'maint-0.4.3' into release-0.4.3

1 0

[tor/release-0.4.3] Merge branch 'maint-0.4.2' into maint-0.4.3
by ahf＠torproject.org 30 Jun '20

30 Jun '20

commit 322abd4fd9ce7e3d60f10e1ef4d343c42d14a9ba Merge: 5a38c73f7 dbb70d85b Author: Alexander Færøy <ahf(a)torproject.org> Date: Tue Jun 30 14:23:41 2020 +0000 Merge branch 'maint-0.4.2' into maint-0.4.3

1 0