- tor-commits - lists.torproject.org

[tpo/master] Update template
by antonela＠torproject.org 02 Jun '20

02 Jun '20

commit 841a1934e58e0653afd62dd609dbc173b4998572 Author: Antonela <hola(a)antonela.me> Date: Tue Jun 2 08:37:57 2020 -0300 Update template Add sidebar callouts --- templates/release.html | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/templates/release.html b/templates/release.html index c1ad2f2e..1671cb60 100644 --- a/templates/release.html +++ b/templates/release.html @@ -8,12 +8,36 @@ <div class="container py-3 mt-5"> + <div class="row"> + <div class="col-sm-9"> {% block body %} {{ this.body }} {% endblock %} </div> + <div class="col-sm-3"> + + <div class="card-body h-100% w-50% text-center border"> + <h4 class="text-primary">{{ _("Do you need help?") }}</h4> + <i class="fas fa-life-ring h1 text-primary mx-auto"></i> + <div class=" pt-2" style="text-align: center;"> + <p class="toc-entry toc-h2 nav-item mb-0" >{{ ("See our community FAQ's") }}</p> + <a href="https://support.torproject.org" class="pt-1">{{ ("Visit Support") }}</a> + </div> + </div> + + <div class="card-body h-100% w-50% text-center mt-4" style="background:#F2ECF4;"> + <h4 class="text-primary">{{ _("Get in Touch") }}</h4> + <i class="fas fa-comments h1 text-primary mx-auto"></i> + <div class=" pt-2" style="text-align: center;"> + <p class="toc-entry toc-h2 nav-item mb-0" >{{ ("Chat with us live!") }}</p> + <a href="https://webchat.oftc.net/?channels=tor" class="pt-1">{{ ("Join us on IRC") }}</a> + </div> + </div> + + </div> + <div class="card mt-5"> <ul class="list-group list-group-flush">  @@ -25,10 +49,13 @@ </div> + </div> + </main> </div> </div> </div> + {% if this.section == "Download" %} {% include 'footer-min.html' %} {% else %}

1 0

[tor/master] Merge branch 'tor-github/pr/1909'
by asn＠torproject.org 02 Jun '20

02 Jun '20

commit 22a26a273e8dc8de663722f96487ca22d4980121 Merge: b6e60f26d 39f2411b3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 2 14:01:49 2020 +0300 Merge branch 'tor-github/pr/1909' 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] Preemptive circs should work with UseEntryGuards 0
by asn＠torproject.org 02 Jun '20

02 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/maint-0.4.3] Preemptive circs should work with UseEntryGuards 0
by asn＠torproject.org 02 Jun '20

02 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/master] Merge branch 'tor-github/pr/1909' into maint-0.4.3
by asn＠torproject.org 02 Jun '20

02 Jun '20

commit 6b05d447bb5ee8512b33ed2f78223e02c6455096 Merge: 688d1b3f0 39f2411b3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 2 14:05:33 2020 +0300 Merge branch 'tor-github/pr/1909' into maint-0.4.3 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/maint-0.4.3] Merge branch 'tor-github/pr/1909' into maint-0.4.3
by asn＠torproject.org 02 Jun '20

02 Jun '20

commit 6b05d447bb5ee8512b33ed2f78223e02c6455096 Merge: 688d1b3f0 39f2411b3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 2 14:05:33 2020 +0300 Merge branch 'tor-github/pr/1909' into maint-0.4.3 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.3'
by asn＠torproject.org 02 Jun '20

02 Jun '20

commit 3ec65c0826991b1dbb96a6ca5bd9002df4a0bfad Merge: 22a26a273 6b05d447b Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 2 14:05:43 2020 +0300 Merge branch 'maint-0.4.3'

1 0

[tor/release-0.4.3] Preemptive circs should work with UseEntryGuards 0
by asn＠torproject.org 02 Jun '20

02 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.3] Merge branch 'maint-0.4.3' into release-0.4.3
by asn＠torproject.org 02 Jun '20

02 Jun '20

commit 7c7e2e2fea662577ecf129e5dce409125a9683fd Merge: bd61a36fd 6b05d447b Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 2 14:05:42 2020 +0300 Merge branch 'maint-0.4.3' into release-0.4.3 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.4.3
by asn＠torproject.org 02 Jun '20

02 Jun '20

commit 6b05d447bb5ee8512b33ed2f78223e02c6455096 Merge: 688d1b3f0 39f2411b3 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jun 2 14:05:33 2020 +0300 Merge branch 'tor-github/pr/1909' into maint-0.4.3 changes/bug34303 | 5 +++++ src/core/or/circuitlist.c | 2 +- src/feature/client/entrynodes.c | 8 +++++++- 3 files changed, 13 insertions(+), 2 deletions(-)

1 0