- tbb-commits - lists.torproject.org

[tor-browser-build/maint-9.5] Add Bug 27903 in ChangeLog
by sysrqb＠torproject.org 03 Jun '20

03 Jun '20

commit a16bf4af86d3c2e5484001b8a22f4b83c3916389 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Jun 2 22:25:59 2020 +0000 Add Bug 27903 in ChangeLog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 85fbe43..3439afa 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -62,6 +62,7 @@ Tor Browser 9.5 -- June 2 2020 * OS X * Bug 32505: Tighten our rules in our entitlements file for macOS * Linux + * Bug 27903: Tor Browser 8 does not respect gtk3 settings * Bug 34315: Avoid reading policies from /etc/firefox on Linux * Android * Bug 26529: Notify user about possible proxy-bypass before opening external app

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklm/bug_33864'
by gk＠torproject.org 01 Jun '20

01 Jun '20

commit dead06d60f62a8042fbf8a1d67a7f7835b7d5fce Merge: 07df060 efe9341 Author: Georg Koppen <gk(a)torproject.org> Date: Mon Jun 1 06:48:50 2020 +0000 Merge remote-tracking branch 'boklm/bug_33864' tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 ++ tools/ansible/roles/tbb-nightly-build/tasks/main.yml | 8 ++++++++ tools/ansible/roles/tbb-nightly-build/templates/nginx.conf | 4 ++++ .../templates/tbb-nightly-build.auth_basic_user_file | 1 + 4 files changed, 15 insertions(+)

1 0

[tor-browser-build/master] Bug 33864: Add auth_basic to nightly build web server
by gk＠torproject.org 01 Jun '20

01 Jun '20

commit efe93411c75b8f2c0ba80164b9af7ab914614b9f Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 21:26:56 2020 +0200 Bug 33864: Add auth_basic to nightly build web server --- tools/ansible/roles/tbb-nightly-build/defaults/main.yml | 2 ++ tools/ansible/roles/tbb-nightly-build/tasks/main.yml | 8 ++++++++ tools/ansible/roles/tbb-nightly-build/templates/nginx.conf | 4 ++++ .../templates/tbb-nightly-build.auth_basic_user_file | 1 + 4 files changed, 15 insertions(+) diff --git a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml index 0a9e94a..55154d3 100644 --- a/tools/ansible/roles/tbb-nightly-build/defaults/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/defaults/main.yml @@ -9,3 +9,5 @@ testsuite_git_commit: ea0942f9da2bdbaf3f140f3baaed1bb56ee9af69 nightly_build_wwwdir: "/home/{{ nightly_build_user }}/www" nightly_build_nginx_enable: true nightly_build_nginx_listen: 127.0.0.1:80 +nightly_build_nginx_auth_basic_enable: true +nightly_build_nginx_auth_basic_content: tor-guest:ezmjAG/jVTat. diff --git a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml index 2c795b8..d5254b6 100644 --- a/tools/ansible/roles/tbb-nightly-build/tasks/main.yml +++ b/tools/ansible/roles/tbb-nightly-build/tasks/main.yml @@ -75,6 +75,14 @@ mode: 0644 owner: "{{ nightly_build_user }}" +- name: create tbb-nightly-build.auth_basic_user_file + template: + src: tbb-nightly-build.auth_basic_user_file + dest: /etc/nginx/tbb-nightly-build.auth_basic_user_file + mode: 0644 + owner: root + when: nightly_build_nginx_auth_basic_enable + - name: install nginx apt: name: nginx diff --git a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf index 9d44bec..62ca8e3 100644 --- a/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf +++ b/tools/ansible/roles/tbb-nightly-build/templates/nginx.conf @@ -12,5 +12,9 @@ server { location /tor-browser-builds { alias {{ testsuite_dir }}/tor-browser-builds; autoindex on; + {% if nightly_build_nginx_auth_basic_enable %} + auth_basic "Use tor-guest as username and password"; + auth_basic_user_file /etc/nginx/tbb-nightly-build.auth_basic_user_file; + {% endif %} } } diff --git a/tools/ansible/roles/tbb-nightly-build/templates/tbb-nightly-build.auth_basic_user_file b/tools/ansible/roles/tbb-nightly-build/templates/tbb-nightly-build.auth_basic_user_file new file mode 100644 index 0000000..45d673c --- /dev/null +++ b/tools/ansible/roles/tbb-nightly-build/templates/tbb-nightly-build.auth_basic_user_file @@ -0,0 +1 @@ +{{ nightly_build_nginx_auth_basic_content }}

1 0

[tor-browser-build/master] Let's mention bug 34347 explicitly in the Changelog
by gk＠torproject.org 30 May '20

30 May '20

commit 07df06075ea473346683b639c4f2703cac04d941 Author: Georg Koppen <gk(a)torproject.org> Date: Sat May 30 05:38:09 2020 +0000 Let's mention bug 34347 explicitly in the Changelog --- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index a4e261c..dfaee83 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -7,6 +7,7 @@ Tor Browser 10.0a1 -- June 2 2020 * Update Tor Launcher to 0.2.21.8 * Translations update * Bug 34321: Add Learn More onboarding item + * Bug 34347: The Tor Network part on the onboarding is not new anymore * Linux * Bug 34315: Avoid reading policies from /etc/firefox on Linux * Android

1 0

[tor-browser-build/master] Release preparations for 10.0a1
by sysrqb＠torproject.org 30 May '20

30 May '20

commit db927811143f4f124f24b435adf477f19fa306c2 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 21:25:47 2020 +0000 Release preparations for 10.0a1 Versions bump and Changelog update. --- projects/firefox-langpacks/config | 2 +- projects/firefox-locale-bundle/config | 2 +- projects/firefox/config | 6 +++--- projects/https-everywhere/config | 2 +- projects/tba-translation/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 22 ++++++++++++++++++++++ projects/tor-launcher/config | 2 +- rbm.conf | 6 +++--- 8 files changed, 33 insertions(+), 11 deletions(-) diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 100644 --- a/projects/firefox-langpacks/config +++ b/projects/firefox-langpacks/config @@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil var: ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]' targets: diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config index 2ea6db6..2f4997f 100644 --- a/projects/firefox-locale-bundle/config +++ b/projects/firefox-locale-bundle/config @@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' var: use_container: 0 ff_version: '[% pc("firefox", "var/firefox_version") %]' - ff_build: build2 + ff_build: build1 diff --git a/projects/firefox/config b/projects/firefox/config index 272634d..a64763e 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,16 +1,16 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 gpg_keyring: torbutton.gpg var: - firefox_platform_version: 68.8.0 + firefox_platform_version: 68.9.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 9.5 + torbrowser_branch: 10.0 branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 7e5aa51..a5be759 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2020.3.16 +version: 2020.5.20 git_url: https://git.torproject.org/https-everywhere.git git_hash: '[% c("version") %]' git_submodule: 1 diff --git a/projects/tba-translation/config b/projects/tba-translation/config index 29388a4..ab5c04e 100644 --- a/projects/tba-translation/config +++ b/projects/tba-translation/config @@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/translation.git # We need to bump the commit before releasing but just pointing to a branch # might cause too much rebuidling of the Firefox part. -git_hash: d3df6cc6e1797733ebca5b370f0f6915f490666f +git_hash: d5bd416ac0cda30893e18f2eb511514bd2e698bd version: '[% c("abbrev") %]' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index ab1c7b8..a4e261c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,25 @@ +Tor Browser 10.0a1 -- June 2 2020 + * All Platforms + * Update Firefox to 68.9.0esr + * Update HTTPS-Everywhere to 2020.5.20 + * Translations update + * Windows + OS X + Linux + * Update Tor Launcher to 0.2.21.8 + * Translations update + * Bug 34321: Add Learn More onboarding item + * Linux + * Bug 34315: Avoid reading policies from /etc/firefox on Linux + * Android + * Bug 30318: Integrate snowflake into mobile Tor Browser + * Bug 34219: Enable ZSTD support properly for Android + * Build System + * Windows + * Bug 31128: Move Windows containers to Debian 10 + * Mac OS X + * Bug 31129: Move macOS containers to Debian 10 + * Android + * Bug 28672: Android reproducible build of Snowflake + Tor Browser 9.5a13 -- May 20 2020 * All Platforms * Bump NoScript to 11.0.26 diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config index eb4dc24..9aaca27 100644 --- a/projects/tor-launcher/config +++ b/projects/tor-launcher/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 0.2.21.7 +version: 0.2.21.8 git_url: https://git.torproject.org/tor-launcher.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index f2d0f4f..d0afe9a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s' var: - torbrowser_version: '9.5a13' - torbrowser_build: 'build2' + torbrowser_version: '10.0a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 9.5a12 + - 9.5a13 project_name: tor-browser multi_lingual: 0 build_mar: 1

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Pick up latest Torbutton code
by sysrqb＠torproject.org 30 May '20

30 May '20

commit 104e4dd98059f0f42bc78929aea4cce0b999d996 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 21:18:49 2020 +0000 fixup! Pick up latest Torbutton code --- toolkit/torproject/torbutton | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolkit/torproject/torbutton b/toolkit/torproject/torbutton index 83bc9c956c3b..0b6562dfffd0 160000 --- a/toolkit/torproject/torbutton +++ b/toolkit/torproject/torbutton @@ -1 +1 @@ -Subproject commit 83bc9c956c3be091c421521fcf05c3cdc393e870 +Subproject commit 0b6562dfffd0e032ea0051a8c09069fba37d4838

1 0

[tor-browser-build/master] Bug 30318 - Integrate snowflake on Android
by sysrqb＠torproject.org 30 May '20

30 May '20

commit 4d57755506496d02107e4dc2adf38252032df383 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 20:26:19 2020 +0000 Bug 30318 - Integrate snowflake on Android --- projects/tor-android-service/config | 2 +- .../0001-Bug-30318-Add-snowflake-support.patch | 90 ++++++++++++++++++++++ projects/tor-onion-proxy-library/build | 1 + projects/tor-onion-proxy-library/config | 1 + 4 files changed, 93 insertions(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 800fc47..7ab3ca7 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: ed2e1479eeddede01b1d510ef79dc5ec798b39c0 +git_hash: ecc251d0a73f7e2034a271efd28036a0108b8688 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1 diff --git a/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch new file mode 100644 index 0000000..03e06aa --- /dev/null +++ b/projects/tor-onion-proxy-library/0001-Bug-30318-Add-snowflake-support.patch @@ -0,0 +1,90 @@ +From e006e215b274b1b834e098b199ea2697bc11b0f1 Mon Sep 17 00:00:00 2001 +From: Georg Koppen <gk(a)torproject.org> +Date: Sun, 10 May 2020 08:29:10 +0000 +Subject: [PATCH] Bug 30318: Add snowflake support + + +diff --git a/android/build.gradle b/android/build.gradle +index a8d9bdc..2392731 100644 +--- a/android/build.gradle ++++ b/android/build.gradle +@@ -93,6 +93,9 @@ task copyPluggableTransports(type: Copy) { + rename { filename -> + filename.replace 'obfs4proxy', 'libObfs4proxy.so' + } ++ rename { filename -> ++ filename.replace 'snowflake-client', 'libSnowflake.so' ++ } + } + + gradle.projectsEvaluated { +diff --git a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +index 2405097..bcb6a37 100644 +--- a/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java ++++ b/universal/src/main/java/com/msopentech/thali/toronionproxy/TorConfigBuilder.java +@@ -109,22 +109,33 @@ public final class TorConfigBuilder { + return this; + } + +- public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportClient) throws IOException { +- if (pluggableTransportClient == null) { ++ public TorConfigBuilder configurePluggableTransportsFromSettings(File pluggableTransportObfs, File pluggableTransportSnow) throws IOException { ++ if (pluggableTransportObfs == null || pluggableTransportSnow == null) { + return this; + } + +- if (!pluggableTransportClient.exists()) { +- throw new IOException("Bridge binary does not exist: " + pluggableTransportClient ++ if (!pluggableTransportObfs.exists()) { ++ throw new IOException("Obfs4proxy binary does not exist: " + pluggableTransportObfs + .getCanonicalPath()); + } + +- if (!pluggableTransportClient.canExecute()) { +- throw new IOException("Bridge binary is not executable: " + pluggableTransportClient ++ if (!pluggableTransportSnow.exists()) { ++ throw new IOException("Snowflake binary does not exist: " + pluggableTransportSnow + .getCanonicalPath()); + } + +- transportPlugin(pluggableTransportClient.getCanonicalPath()); ++ if (!pluggableTransportObfs.canExecute()) { ++ throw new IOException("Obfs4proxy binary is not executable: " + pluggableTransportObfs ++ .getCanonicalPath()); ++ } ++ ++ if (!pluggableTransportSnow.canExecute()) { ++ throw new IOException("Snowflake binary is not executable: " + pluggableTransportSnow ++ .getCanonicalPath()); ++ } ++ ++ ++ transportPlugin(pluggableTransportObfs.getCanonicalPath(), pluggableTransportSnow.getCanonicalPath()); + return this; + } + +@@ -491,8 +502,9 @@ public final class TorConfigBuilder { + return transPort(settings.transPort()); + } + +- public TorConfigBuilder transportPlugin(String clientPath) { +- buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(clientPath).append('\n'); ++ public TorConfigBuilder transportPlugin(String obfsPath, String snowPath) { ++ buffer.append("ClientTransportPlugin meek_lite,obfs3,obfs4 exec ").append(obfsPath).append('\n'); ++ buffer.append("ClientTransportPlugin snowflake exec ").append(snowPath).append(" -url https://snowflake-broker.azureedge.net/ -front ajax.aspnetcdn.com -ice stun:stun.l.google.com:19302\n"); + return this; + } + +@@ -557,6 +569,9 @@ public final class TorConfigBuilder { + case 3: + reqBridgeType = "meek_lite"; + break; ++ case 4: ++ reqBridgeType = "snowflake"; ++ break; + default: + throw new IOException("Requested unknown transport type: " + bridgesType); + } +-- +2.26.2 + diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index dfe1837..937c72f 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -22,6 +22,7 @@ cd /var/tmp/build/[% project %]-[% c('version') %] patch -p1 < $rootdir/gradle.patch patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch +patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index cffcdd0..98bb93c 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -28,3 +28,4 @@ input_files: exec: '[% INCLUDE "fetch-gradle-dependencies" %]' - filename: gradle.patch - filename: 0001-Bug-33931-Filter-bridges-in-stream-by-type.patch + - filename: 0001-Bug-30318-Add-snowflake-support.patch

1 0

[tor-browser-build/master] Bug 28672: Android reproducible build of Snowflake
by sysrqb＠torproject.org 30 May '20

30 May '20

commit 853e75e9276432a39153db2e3fa54375af9b8822 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Apr 30 13:46:56 2020 +0000 Bug 28672: Android reproducible build of Snowflake --- projects/snowflake/build | 7 +++++++ projects/snowflake/config | 3 +++ projects/tor-browser/config | 2 +- projects/tor-onion-proxy-library/build | 7 ++++++- projects/tor-onion-proxy-library/config | 2 ++ rbm.conf | 3 +++ 6 files changed, 22 insertions(+), 2 deletions(-) diff --git a/projects/snowflake/build b/projects/snowflake/build index 2724dd9..a72caba 100644 --- a/projects/snowflake/build +++ b/projects/snowflake/build @@ -5,6 +5,13 @@ distdir=/var/tmp/dist/[% project %] [% c("var/set_PTDIR_DOCSDIR") -%] mkdir -p $PTDIR $DOCSDIR +[% IF c("var/android") -%] + [% pc(c('var/compiler'), 'var/setup', { compiler_tarfile => c('input_files_by_name/' _ c('var/compiler')) }) %] + # We need to explicitly set CGO_ENABLED with Go 1.13.x as the Android build + # breaks otherwise. + export CGO_ENABLED=1 +[% END -%] + tar -C /var/tmp/dist -xf [% c('input_files_by_name/uniuri') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/goptlib') %] tar -C /var/tmp/dist -xf [% c('input_files_by_name/pion-webrtc') %] diff --git a/projects/snowflake/config b/projects/snowflake/config index efd0707..898fe70 100644 --- a/projects/snowflake/config +++ b/projects/snowflake/config @@ -22,3 +22,6 @@ input_files: project: kcp-go - name: smux project: smux + - name: '[% c("var/compiler") %]' + project: '[% c("var/compiler") %]' + enable: '[% c("var/android") %]' diff --git a/projects/tor-browser/config b/projects/tor-browser/config index 3f41ed2..809bfa0 100644 --- a/projects/tor-browser/config +++ b/projects/tor-browser/config @@ -70,7 +70,7 @@ input_files: enable: '[% ! c("var/android") %]' - project: snowflake name: snowflake - enable: '[% c("var/snowflake") %]' + enable: '[% c("var/snowflake") && ! c("var/android") %]' - filename: Bundle-Data enable: '[% ! c("var/android") %]' - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suit… diff --git a/projects/tor-onion-proxy-library/build b/projects/tor-onion-proxy-library/build index c8025ad..dfe1837 100644 --- a/projects/tor-onion-proxy-library/build +++ b/projects/tor-onion-proxy-library/build @@ -26,12 +26,17 @@ patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4') %] -# Overwrite the obfs4proxy binary provided by Pluto +# Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake +tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake') %] + +# Overwrite the obfs4proxy binary provided by Pluto and add Snowflake for d in external/pluto/bin/*; do cp obfs4proxy $d/ + cp snowflake-client $d/ done rm obfs4proxy +rm snowflake-client # Build Android Libraries and Apps $GRADLE_HOME/gradle-4.10.2/bin/gradle --offline --no-daemon -P androidplugin=3.1.0 -Dmaven.repo.local=$gradle_repo assembleRelease -x lint diff --git a/projects/tor-onion-proxy-library/config b/projects/tor-onion-proxy-library/config index 5d90481..cffcdd0 100644 --- a/projects/tor-onion-proxy-library/config +++ b/projects/tor-onion-proxy-library/config @@ -21,6 +21,8 @@ input_files: project: '[% c("var/compiler") %]' - project: obfs4 name: obfs4 + - project: snowflake + name: snowflake - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]' name: gradle-dependencies exec: '[% INCLUDE "fetch-gradle-dependencies" %]' diff --git a/rbm.conf b/rbm.conf index ba1cc23..f2d0f4f 100644 --- a/rbm.conf +++ b/rbm.conf @@ -253,6 +253,9 @@ targets: android_min_api_x86_64: 21 CC: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang' CXX: '$ANDROID_NDK_HOME/[% c("var/toolchain_arch") %]/bin/clang++' + # We only build snowflake on the alpha and nightly + # channels for now. + snowflake: '[% c("var/alpha") || c("var/nightly") %]' container: suite: buster arch: amd64

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] squash! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens
by sysrqb＠torproject.org 30 May '20

30 May '20

commit 002d35ffa55518c5517c2be746da2678a70da47a Author: Georg Koppen <gk(a)torproject.org> Date: Fri May 8 06:31:09 2020 +0000 squash! Bug 28329 - Part 4. Add new Tor Bootstrapping and configuration screens Bug 30318: Integrate snowflake into mobile Tor Browser --- .../res/layout/preference_tor_network_select_bridge_type.xml | 11 +++++++++++ .../java/org/mozilla/gecko/torbootstrap/TorPreferences.java | 7 ++++++- mobile/android/base/locales/en-US/torbrowser_strings.dtd | 1 + mobile/android/base/strings.xml.in | 1 + 4 files changed, 19 insertions(+), 1 deletion(-) diff --git a/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml b/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml index 4ef5925e233d..6108819430d3 100644 --- a/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml +++ b/mobile/android/app/src/main/res/layout/preference_tor_network_select_bridge_type.xml @@ -74,6 +74,17 @@ android:textSize="16sp" android:text="@string/pref_bridges_type_meek_azure"/> <include layout="@xml/separator" /> + <RadioButton android:id="@+id/radio_pref_bridges_snowflake" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="10sp" + android:layout_marginBottom="10sp" + android:buttonTint="@color/tor_bridges_select_builtin" + android:fontFamily="Roboto-Regular" + android:textColor="#DE000000" + android:textSize="16sp" + android:text="@string/pref_bridges_type_snowflake"/> + <include layout="@xml/separator" /> </RadioGroup> </LinearLayout> diff --git a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java index cb37f3867ca4..66473529c069 100644 --- a/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java +++ b/mobile/android/base/java/org/mozilla/gecko/torbootstrap/TorPreferences.java @@ -679,6 +679,9 @@ public class TorPreferences extends AppCompatPreferenceActivity { case "meek": buttonId = R.id.radio_pref_bridges_meek_azure; break; + case "snowflake": + buttonId = R.id.radio_pref_bridges_snowflake; + break; } if (buttonId != -1) { @@ -730,11 +733,13 @@ public class TorPreferences extends AppCompatPreferenceActivity { // // Similarly, if meek-azure is chosen, substitute it with "meek" // (tor-android-service only handles these keywords specially if - // they are less than 5 characters). + // they are less than 10 characters). if (bridgesType.contains("obfs4")) { bridgesType = "obfs4"; } else if (bridgesType.contains("meek-azure")) { bridgesType = "meek"; + } else if (bridgesType.contains("snowflake")) { + bridgesType = "snowflake"; } Preference bridgesTypePref = findPreference(PREFS_BRIDGES_TYPE); diff --git a/mobile/android/base/locales/en-US/torbrowser_strings.dtd b/mobile/android/base/locales/en-US/torbrowser_strings.dtd index 8d000f90d561..d4009b272ce9 100644 --- a/mobile/android/base/locales/en-US/torbrowser_strings.dtd +++ b/mobile/android/base/locales/en-US/torbrowser_strings.dtd @@ -54,6 +54,7 @@  <!ENTITY pref_bridges_type_obfs4 "obfs4 (recommended)"> <!ENTITY pref_bridges_type_meek_azure "meek-azure"> +<!ENTITY pref_bridges_type_snowflake "snowflake"> <!ENTITY pref_tor_network_bridges_enabled_change_builtin "You\'re using a built-in bridge to connect to Tor. Change"> <!ENTITY pref_tor_network_bridges_enabled_change_custom "You\'re using a custom bridge to connect to Tor. Change"> <!ENTITY pref_tor_network_using_multiple_provided_bridges "You\'re using multiple custom bridges."> diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index 5a6c14bb4331..2dc7c6650880 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -102,6 +102,7 @@ <string name="pref_choice_tor_bridges_enabled_summary">&pref_choice_tor_bridges_enabled_summary;</string> <string name="pref_bridges_type_obfs4">&pref_bridges_type_obfs4;</string> <string name="pref_bridges_type_meek_azure">&pref_bridges_type_meek_azure;</string> + <string name="pref_bridges_type_snowflake">&pref_bridges_type_snowflake;</string> <string name="pref_tor_bridges_provide_manual_button_title">&pref_tor_bridges_provide_manual_button_title;</string> <string name="pref_tor_bridges_provide_select_text_title">&pref_tor_bridges_provide_select_text_title;</string>

1 0

[tor-browser/tor-browser-68.9.0esr-10.0-1] fixup! Bug 34321 - Add Learn More onboarding item
by sysrqb＠torproject.org 30 May '20

30 May '20

commit c64571e507f1d6868f6a08d807489d6b34063af1 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Fri May 29 13:24:39 2020 +0000 fixup! Bug 34321 - Add Learn More onboarding item --- browser/extensions/onboarding/content/Onboarding.jsm | 2 -- 1 file changed, 2 deletions(-) diff --git a/browser/extensions/onboarding/content/Onboarding.jsm b/browser/extensions/onboarding/content/Onboarding.jsm index 2115b2bd9d27..b411a3039a3e 100644 --- a/browser/extensions/onboarding/content/Onboarding.jsm +++ b/browser/extensions/onboarding/content/Onboarding.jsm @@ -124,7 +124,6 @@ var onboardingTourset = { "tor-network-9.0": { id: "onboarding-tour-tor-network-9-0", tourNameId: "onboarding.tour-tor-network", - highlightId: "onboarding.tour-tor-update.prefix-new", getPage(win) { let div = win.document.createElement("div"); @@ -249,7 +248,6 @@ var onboardingTourset = { "toolbar-update-9.0": { id: "onboarding-tour-tor-toolbar-update-9-0", tourNameId: "onboarding.tour-tor-toolbar", - highlightId: "onboarding.tour-tor-update.prefix-updated", getPage(win) { let div = win.document.createElement("div");

1 0