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

[tor/release-0.4.3] Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 855cd533e17f4dc4cd055fa8bb31ee3b187451dc Merge: 93d12baf8 612c40bc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 16 12:21:49 2020 -0400 Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3 changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- src/test/test_process_descs.c | 17 ++++++++++------- 3 files changed, 24 insertions(+), 18 deletions(-)

1 0

[tor/release-0.4.3] Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 452398913a11e9bf21d6a0ef0a8d8eac054cc636 Merge: 9ef8f5d1b 460b97380 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 16 10:40:55 2020 -0400 Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-)

1 0

[tor/master] Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 460b97380bdb7187c2b2e924aa1a2940afd6035d Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Dec 5 19:06:35 2019 -0500 Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version() --- changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/changes/ticket32672 b/changes/ticket32672 new file mode 100644 index 000000000..351329ba2 --- /dev/null +++ b/changes/ticket32672 @@ -0,0 +1,4 @@ + o Minor features (directory authorities): + - Directory authorities now reject descriptors from relays running Tor + versions from the 0.2.9 and 0.4.0 series, but still allow the 0.3.5 + series. Resolves ticket 32672. Patch by Neel Chauhan. diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 760560a5d..b4dbc8975 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -326,22 +326,21 @@ dirserv_rejects_tor_version(const char *platform, static const char please_upgrade_string[] = "Tor version is insecure or unsupported. Please upgrade!"; - /* Versions before Tor 0.2.9 are unsupported. Versions between 0.2.9.0 and - * 0.2.9.4 suffer from bug #20499, where relays don't keep their consensus - * up to date */ - if (!tor_version_as_new_as(platform,"0.2.9.5-alpha")) { + /* Versions before Tor 0.3.5 are unsupported. + * + * Also, reject unstable versions of 0.3.5, since (as of this writing) + * they are almost none of the network. */ + if (!tor_version_as_new_as(platform,"0.3.5.7")) { if (msg) *msg = please_upgrade_string; return true; } - /* Series between Tor 0.3.0 and 0.3.4 inclusive are unsupported, and some - * have bug #27841, which makes them broken as intro points. Reject them. - * - * Also reject unstable versions of 0.3.5, since (as of this writing) - * they are almost none of the network. */ - if (tor_version_as_new_as(platform,"0.3.0.0-alpha-dev") && - !tor_version_as_new_as(platform,"0.3.5.7")) { + /* Series between Tor 0.3.6 and 0.4.1.4-rc inclusive are unsupported. + * Reject them. 0.3.6.0-alpha-dev only existed for a short time, before + * it was renamed to 0.4.0.0-alpha-dev. */ + if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") && + !tor_version_as_new_as(platform,"0.4.1.5")) { if (msg) { *msg = please_upgrade_string; }

1 0

[tor/maint-0.4.3] Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 452398913a11e9bf21d6a0ef0a8d8eac054cc636 Merge: 9ef8f5d1b 460b97380 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 16 10:40:55 2020 -0400 Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-)

1 0

[tor/maint-0.4.3] Adjust unit tests for patch for 32672 (rejecting old version)
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 612c40bc39237fb28a98a7e43ca4abaf139d091c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 16 10:42:40 2020 -0400 Adjust unit tests for patch for 32672 (rejecting old version) Patch by Neel Chauhan. --- src/test/test_process_descs.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c index 7dc9abde3..409e66206 100644 --- a/src/test/test_process_descs.c +++ b/src/test/test_process_descs.c @@ -20,13 +20,10 @@ test_process_descs_versions(void *arg) { "Tor 0.1.2.3-alpha", true }, // a non-tor program: don't reject. { "Wombat 0.1.2.3-alpha", false }, - // a slightly old version: reject - { "Tor 0.2.9.4-alpha", true }, - // a slightly old version: just new enough to support. - { "Tor 0.2.9.5-alpha", false }, - // a newer 0.2.9 version: supported. - { "Tor 0.2.9.100", false }, // some unsupported versions: reject. + { "Tor 0.2.9.4-alpha", true }, + { "Tor 0.2.9.5-alpha", true }, + { "Tor 0.2.9.100", true }, { "Tor 0.3.0.0-alpha-dev", true }, { "Tor 0.3.0.2-alpha", true }, { "Tor 0.3.0.5", true }, @@ -37,11 +34,17 @@ test_process_descs_versions(void *arg) { "Tor 0.3.4.100", true }, { "Tor 0.3.5.1-alpha", true }, { "Tor 0.3.5.6-rc", true}, + { "Tor 0.4.0.1-alpha", true }, + { "Tor 0.4.0.5", true }, + { "Tor 0.4.1.1-alpha", true }, + { "Tor 0.4.1.4-rc", true }, // new enough to be supported { "Tor 0.3.5.7", false }, { "Tor 0.3.5.8", false }, - { "Tor 0.4.0.1-alpha", false }, { "Tor 0.4.1.5", false }, + { "Tor 0.4.2.1-alpha", false }, + { "Tor 0.4.2.4-rc", false }, + { "Tor 0.4.3.0-alpha-dev", false }, // Very far in the future { "Tor 100.100.1.5", false }, };

1 0

[tor/maint-0.4.3] Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version()
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 460b97380bdb7187c2b2e924aa1a2940afd6035d Author: Neel Chauhan <neel(a)neelc.org> Date: Thu Dec 5 19:06:35 2019 -0500 Reject 0.2.9 and 0.4.0 in dirserv_rejects_tor_version() --- changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/changes/ticket32672 b/changes/ticket32672 new file mode 100644 index 000000000..351329ba2 --- /dev/null +++ b/changes/ticket32672 @@ -0,0 +1,4 @@ + o Minor features (directory authorities): + - Directory authorities now reject descriptors from relays running Tor + versions from the 0.2.9 and 0.4.0 series, but still allow the 0.3.5 + series. Resolves ticket 32672. Patch by Neel Chauhan. diff --git a/src/feature/dirauth/process_descs.c b/src/feature/dirauth/process_descs.c index 760560a5d..b4dbc8975 100644 --- a/src/feature/dirauth/process_descs.c +++ b/src/feature/dirauth/process_descs.c @@ -326,22 +326,21 @@ dirserv_rejects_tor_version(const char *platform, static const char please_upgrade_string[] = "Tor version is insecure or unsupported. Please upgrade!"; - /* Versions before Tor 0.2.9 are unsupported. Versions between 0.2.9.0 and - * 0.2.9.4 suffer from bug #20499, where relays don't keep their consensus - * up to date */ - if (!tor_version_as_new_as(platform,"0.2.9.5-alpha")) { + /* Versions before Tor 0.3.5 are unsupported. + * + * Also, reject unstable versions of 0.3.5, since (as of this writing) + * they are almost none of the network. */ + if (!tor_version_as_new_as(platform,"0.3.5.7")) { if (msg) *msg = please_upgrade_string; return true; } - /* Series between Tor 0.3.0 and 0.3.4 inclusive are unsupported, and some - * have bug #27841, which makes them broken as intro points. Reject them. - * - * Also reject unstable versions of 0.3.5, since (as of this writing) - * they are almost none of the network. */ - if (tor_version_as_new_as(platform,"0.3.0.0-alpha-dev") && - !tor_version_as_new_as(platform,"0.3.5.7")) { + /* Series between Tor 0.3.6 and 0.4.1.4-rc inclusive are unsupported. + * Reject them. 0.3.6.0-alpha-dev only existed for a short time, before + * it was renamed to 0.4.0.0-alpha-dev. */ + if (tor_version_as_new_as(platform,"0.3.6.0-alpha-dev") && + !tor_version_as_new_as(platform,"0.4.1.5")) { if (msg) { *msg = please_upgrade_string; }

1 0

[tor/maint-0.4.3] Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 855cd533e17f4dc4cd055fa8bb31ee3b187451dc Merge: 93d12baf8 612c40bc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 16 12:21:49 2020 -0400 Merge branch 'ticket32672_042_squashed_w_test' into maint-0.4.3 changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- src/test/test_process_descs.c | 17 ++++++++++------- 3 files changed, 24 insertions(+), 18 deletions(-)

1 0

[tor/master] Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 452398913a11e9bf21d6a0ef0a8d8eac054cc636 Merge: 9ef8f5d1b 460b97380 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 16 10:40:55 2020 -0400 Merge branch 'ticket32672_041_squashed' into ticket32672_042_squashed_w_test changes/ticket32672 | 4 ++++ src/feature/dirauth/process_descs.c | 21 ++++++++++----------- 2 files changed, 14 insertions(+), 11 deletions(-)

1 0

[tor/master] Adjust unit tests for patch for 32672 (rejecting old version)
by nickm＠torproject.org 16 Mar '20

16 Mar '20

commit 612c40bc39237fb28a98a7e43ca4abaf139d091c Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 16 10:42:40 2020 -0400 Adjust unit tests for patch for 32672 (rejecting old version) Patch by Neel Chauhan. --- src/test/test_process_descs.c | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/src/test/test_process_descs.c b/src/test/test_process_descs.c index 7dc9abde3..409e66206 100644 --- a/src/test/test_process_descs.c +++ b/src/test/test_process_descs.c @@ -20,13 +20,10 @@ test_process_descs_versions(void *arg) { "Tor 0.1.2.3-alpha", true }, // a non-tor program: don't reject. { "Wombat 0.1.2.3-alpha", false }, - // a slightly old version: reject - { "Tor 0.2.9.4-alpha", true }, - // a slightly old version: just new enough to support. - { "Tor 0.2.9.5-alpha", false }, - // a newer 0.2.9 version: supported. - { "Tor 0.2.9.100", false }, // some unsupported versions: reject. + { "Tor 0.2.9.4-alpha", true }, + { "Tor 0.2.9.5-alpha", true }, + { "Tor 0.2.9.100", true }, { "Tor 0.3.0.0-alpha-dev", true }, { "Tor 0.3.0.2-alpha", true }, { "Tor 0.3.0.5", true }, @@ -37,11 +34,17 @@ test_process_descs_versions(void *arg) { "Tor 0.3.4.100", true }, { "Tor 0.3.5.1-alpha", true }, { "Tor 0.3.5.6-rc", true}, + { "Tor 0.4.0.1-alpha", true }, + { "Tor 0.4.0.5", true }, + { "Tor 0.4.1.1-alpha", true }, + { "Tor 0.4.1.4-rc", true }, // new enough to be supported { "Tor 0.3.5.7", false }, { "Tor 0.3.5.8", false }, - { "Tor 0.4.0.1-alpha", false }, { "Tor 0.4.1.5", false }, + { "Tor 0.4.2.1-alpha", false }, + { "Tor 0.4.2.4-rc", false }, + { "Tor 0.4.3.0-alpha-dev", false }, // Very far in the future { "Tor 100.100.1.5", false }, };

1 0

[tpo/master] Add link to blog post regarding javascript
by hiro＠torproject.org 16 Mar '20

16 Mar '20

commit d460fb4d860928bfcdabcd63a97c2bf4b4166c8c Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Mon Mar 16 13:47:35 2020 +0000 Add link to blog post regarding javascript --- templates/hero-download.html | 5 +++++ templates/macros/downloads.html | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/templates/hero-download.html b/templates/hero-download.html index b51afd9..1589a88 100644 --- a/templates/hero-download.html +++ b/templates/hero-download.html @@ -45,6 +45,11 @@ </div> </div> +<div class="row pt-5"> + {% from "macros/downloads.html" import render_tor_browser_blog_post %} + <h3 class="mx-auto text-white text-center">{{ _('Disabling Javascript: Please read the latest %s for more information.') |format(render_tor_browser_blog_post())| safe }}</h3> +</div> + <div class="row p-5"> <a class="mx-auto text-white py-3 text-center" href="{{ 'languages'|url(alt=this.alt) }}"><u>{{ _('Download in another language or platform') }}</u></a> <a class="mx-auto text-white py-3 text-center" href="{{ 'alpha'|url(alt=this.alt) }}"><u>{{ _('Download the latest alpha build') }}</u></a> diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 1ca65ad..49ad3de 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -67,3 +67,7 @@ {% macro render_tor_browser_manual() %} <a class="mx-auto" href="https://tb-manual.torproject.org" target="_blank"><u>{{ _('Tor Browser manual') }}</u></a> {% endmacro %} + +{% macro render_tor_browser_blog_post() %} +<a class="mx-auto" href="https://blog.torproject.org/new-release-tor-browser-906" target="_blank"><u>{{ _('blog post') }}</u></a> +{% endmacro %}

1 0