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

[bridgedb/develop] Merge branch 'enhancement/34154' into develop
by phw＠torproject.org 22 May '20

22 May '20

commit 19ba2da7b66cfccee014bde2804f10dafd0696b7 Merge: f25943e 3337b4a Author: Philipp Winter <phw(a)nymity.ch> Date: Fri May 22 15:13:38 2020 -0700 Merge branch 'enhancement/34154' into develop CHANGELOG | 4 ++++ bridgedb/Storage.py | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-)

1 0

[bridgedb/develop] Add new fields to BlockedBridges.
by phw＠torproject.org 22 May '20

22 May '20

commit 3337b4ac349cd9d4021f9b0616e179be99958c0a Author: Philipp Winter <phw(a)nymity.ch> Date: Wed May 20 14:22:05 2020 -0700 Add new fields to BlockedBridges. Our new tool wolpertinger will populate these fields after delegating censorship measurement to OONI. This fixes <https://bugs.torproject.org/34154>. --- CHANGELOG | 4 ++++ bridgedb/Storage.py | 8 +++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/CHANGELOG b/CHANGELOG index 5ac9e0b..80d3afa 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,7 @@ + * FIXES https://bugs.torproject.org/34154 + Add new fields to the SQLite table BlockedBridges in preparation for taking + into account OONI's bridge measurement results. + * FIXES https://bugs.torproject.org/31528 BridgeDB's UI uses a bunch of obscure "chatspeak" references in its UI. One example is that it responds with "Uh oh, spaghettios!" if there are diff --git a/bridgedb/Storage.py b/bridgedb/Storage.py index d725fa3..0fe8851 100644 --- a/bridgedb/Storage.py +++ b/bridgedb/Storage.py @@ -70,7 +70,13 @@ SCHEMA2_SCRIPT = """ CREATE TABLE BlockedBridges ( id INTEGER PRIMARY KEY NOT NULL, hex_key, - blocking_country + bridge_type, + address, + port, + blocking_country, + blocking_asn, + measured_by, + last_measured ); CREATE INDEX BlockedBridgesBlockingCountry on BlockedBridges(hex_key);

1 0

[tpo/develop] Add new Tor Browser version 9.5a13
by gus＠torproject.org 22 May '20

22 May '20

commit 1ffd3e5681f295d687ef4afc33c65b36b578079e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 22 20:18:32 2020 +0000 Add new Tor Browser version 9.5a13 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index a1a54e03..1585eced 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -40,5 +40,9 @@ body: "9.5a12", "9.5a12-MacOS", "9.5a12-Linux", -"9.5a12-Windows" +"9.5a12-Windows", +"9.5a13", +"9.5a13-MacOS", +"9.5a13-Linux", +"9.5a13-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index 3f8ca442..ecb10870 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.0.10 win32 = 0.4.2.7 [torbrowser-alpha] -version = 9.5a12 +version = 9.5a13 [tor-stable] version = 0.4.3.5

1 0

[tpo/develop] Merge branch 'master' into develop
by gus＠torproject.org 22 May '20

22 May '20

commit b56abf842240dcd8bc7782938555bb2270baded7 Merge: 8b7f1500 48dba788 Author: gus <gus(a)torproject.org> Date: Fri May 22 17:38:38 2020 -0400 Merge branch 'master' into develop .../torbrowser/RecommendedTBBVersions/contents.lr | 34 ++++------------------ databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 30 deletions(-)

1 0

[tpo/develop] Remove old versions from RecommendedTBBVersions
by gus＠torproject.org 22 May '20

22 May '20

commit 48dba788de24f5ffcea0bc483fde90eb2eadde31 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 22 20:26:01 2020 +0000 Remove old versions from RecommendedTBBVersions 9.0.7, 9.0.8, 9.0.9 9.5a8, 9.5a9. 9.5a10, 9.5a11 --- .../torbrowser/RecommendedTBBVersions/contents.lr | 28 ---------------------- 1 file changed, 28 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 1585eced..10c7c2b9 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,38 +5,10 @@ _template: empty.html body: [ -"9.0.7", -"9.0.7-MacOS", -"9.0.7-Linux", -"9.0.7-Windows", -"9.0.8", -"9.0.8-MacOS", -"9.0.8-Linux", -"9.0.8-Windows", -"9.0.9", -"9.0.9-MacOS", -"9.0.9-Linux", -"9.0.9-Windows", "9.0.10", "9.0.10-MacOS", "9.0.10-Linux", "9.0.10-Windows", -"9.5a8", -"9.5a8-MacOS", -"9.5a8-Linux", -"9.5a8-Windows", -"9.5a9", -"9.5a9-MacOS", -"9.5a9-Linux", -"9.5a9-Windows", -"9.5a10", -"9.5a10-MacOS", -"9.5a10-Linux", -"9.5a10-Windows", -"9.5a11", -"9.5a11-MacOS", -"9.5a11-Linux", -"9.5a11-Windows", "9.5a12", "9.5a12-MacOS", "9.5a12-Linux",

1 0

[tpo/develop] Adding mullvad logo
by gus＠torproject.org 22 May '20

22 May '20

commit 8aeb5565c12dfa16ef8e0e9bfcd59755df5f2ffb Author: Bekeela Davila <bekeela(a)torproject.org> Date: Thu May 21 19:15:11 2020 +0000 Adding mullvad logo --- assets/static/images/sponsors/Mullvad_logo.png | Bin 0 -> 45792 bytes content/about/sponsors/mullvad-vpn/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/assets/static/images/sponsors/Mullvad_logo.png b/assets/static/images/sponsors/Mullvad_logo.png new file mode 100644 index 00000000..cf34a866 Binary files /dev/null and b/assets/static/images/sponsors/Mullvad_logo.png differ diff --git a/content/about/sponsors/mullvad-vpn/contents.lr b/content/about/sponsors/mullvad-vpn/contents.lr new file mode 100644 index 00000000..31ac275c --- /dev/null +++ b/content/about/sponsors/mullvad-vpn/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: true +--- +time: 2020 +--- +name: Mullvad VPN +--- +key: 21 +--- +logo: /static/images/sponsors/Mullvad_logo.png +--- +_hidden: yes +--- +link: https://mullvad.net/en/ +--- +description: +Mullvad is a VPN service that helps users keep their online activity, identity, and location private. +With a fundamental belief in privacy as a universal right, Mullvad's ultimate goal is to make Internet censorship and mass surveillance ineffective.

1 0

[tpo/develop] Update templates for new releases pages
by gus＠torproject.org 22 May '20

22 May '20

commit b1b270e6db37fcce7642d908ad297d66000b2d16 Author: Antonela <hola(a)antonela.me> Date: Fri May 22 14:17:13 2020 -0300 Update templates for new releases pages https://trac.torproject.org/projects/tor/ticket/31660 --- content/{release => releases}/contents.lr | 0 content/{release/95 => releases/tor-browser-95}/contents.lr | 0 2 files changed, 0 insertions(+), 0 deletions(-) diff --git a/content/release/contents.lr b/content/releases/contents.lr similarity index 100% rename from content/release/contents.lr rename to content/releases/contents.lr diff --git a/content/release/95/contents.lr b/content/releases/tor-browser-95/contents.lr similarity index 100% rename from content/release/95/contents.lr rename to content/releases/tor-browser-95/contents.lr

1 0

[tpo/develop] Merge branch 'sponsor-update' into develop
by gus＠torproject.org 22 May '20

22 May '20

commit 8b7f15004e7be6020fef48d3ea73159bae12cdc0 Merge: 1aef6ad8 8aeb5565 Author: gus <gus(a)torproject.org> Date: Fri May 22 17:24:00 2020 -0400 Merge branch 'sponsor-update' into develop assets/static/images/sponsors/Mullvad_logo.png | Bin 0 -> 45792 bytes content/about/sponsors/mullvad-vpn/contents.lr | 19 +++++++++++++++++++ content/{release => releases}/contents.lr | 0 .../95 => releases/tor-browser-95}/contents.lr | 0 4 files changed, 19 insertions(+)

1 0

[tpo/master] Remove old versions from RecommendedTBBVersions
by sysrqb＠torproject.org 22 May '20

22 May '20

commit 48dba788de24f5ffcea0bc483fde90eb2eadde31 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 22 20:26:01 2020 +0000 Remove old versions from RecommendedTBBVersions 9.0.7, 9.0.8, 9.0.9 9.5a8, 9.5a9. 9.5a10, 9.5a11 --- .../torbrowser/RecommendedTBBVersions/contents.lr | 28 ---------------------- 1 file changed, 28 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 1585eced..10c7c2b9 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -5,38 +5,10 @@ _template: empty.html body: [ -"9.0.7", -"9.0.7-MacOS", -"9.0.7-Linux", -"9.0.7-Windows", -"9.0.8", -"9.0.8-MacOS", -"9.0.8-Linux", -"9.0.8-Windows", -"9.0.9", -"9.0.9-MacOS", -"9.0.9-Linux", -"9.0.9-Windows", "9.0.10", "9.0.10-MacOS", "9.0.10-Linux", "9.0.10-Windows", -"9.5a8", -"9.5a8-MacOS", -"9.5a8-Linux", -"9.5a8-Windows", -"9.5a9", -"9.5a9-MacOS", -"9.5a9-Linux", -"9.5a9-Windows", -"9.5a10", -"9.5a10-MacOS", -"9.5a10-Linux", -"9.5a10-Windows", -"9.5a11", -"9.5a11-MacOS", -"9.5a11-Linux", -"9.5a11-Windows", "9.5a12", "9.5a12-MacOS", "9.5a12-Linux",

1 0

[tpo/master] Add new Tor Browser version 9.5a13
by sysrqb＠torproject.org 22 May '20

22 May '20

commit 1ffd3e5681f295d687ef4afc33c65b36b578079e Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 22 20:18:32 2020 +0000 Add new Tor Browser version 9.5a13 --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- databags/versions.ini | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index a1a54e03..1585eced 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -40,5 +40,9 @@ body: "9.5a12", "9.5a12-MacOS", "9.5a12-Linux", -"9.5a12-Windows" +"9.5a12-Windows", +"9.5a13", +"9.5a13-MacOS", +"9.5a13-Linux", +"9.5a13-Windows" ] diff --git a/databags/versions.ini b/databags/versions.ini index 3f8ca442..ecb10870 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -3,7 +3,7 @@ version = 9.0.10 win32 = 0.4.2.7 [torbrowser-alpha] -version = 9.5a12 +version = 9.5a13 [tor-stable] version = 0.4.3.5

1 0