Tor Browser 10.5 release preparations

Version bumps and Changelog update

projects/firefox/config

 # 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-build3'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1

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: 0480d9e3ada42bfb02a77be59a54682ce2179cff
+git_hash: 91ff9c1637358b8e31c63796e837af4a91f1680b
 version: '[% c("abbrev") %]'

projects/tor-android-service/0001-Revert-Bug-30318-Add-snowflake-support.patch

-From f3cf622e537a1283b821b3f3ce8e396a01bcb84b Mon Sep 17 00:00:00 2001
-From: Georg Koppen <gk@torproject.org>
-Date: Sat, 16 Jan 2021 20:56:30 +0000
-Subject: [PATCH] Revert "Bug 30318: Add snowflake support"
-
-This reverts commit ecc251d0a73f7e2034a271efd28036a0108b8688.
-
-diff --git a/service/src/main/assets/common/bridges.txt b/service/src/main/assets/common/bridges.txt
-index 1525eba..fe37735 100644
---- a/service/src/main/assets/common/bridges.txt
-+++ b/service/src/main/assets/common/bridges.txt
-@@ -13,5 +13,3 @@ obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0
- obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0
- obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0
- meek_lite 0.0.2.0:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com
--
--snowflake 0.0.3.0:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72
-diff --git a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java
-index 52bc4fe..198c981 100644
---- a/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java
-+++ b/service/src/main/java/org/torproject/android/service/CustomTorInstaller.java
-@@ -40,17 +40,14 @@ public class CustomTorInstaller extends TorInstaller {
-     @Override
-     public InputStream openBridgesStream() throws IOException {
-         /*
--            BridgesList is an overloaded field, which can cause some confusion.
--            The list can be:
--              1) a filter like obfs4, meek, or snowflake OR
--              2) it can be a custom bridge
--            For (1), we just pass back all bridges, the filter will occur
--              elsewhere in the library.
--            For (2) we return the bridge list as a raw stream.
--            If length is greater than 9, then we know this is a custom bridge
-+            BridgesList is an overloaded field, which can cause some confusion. The list can be:
-+            1) a filter like obfs4 or meek OR 2) it can be a custom bridge
-+            For (1), we just pass back all bridges, the filter will occur elsewhere in the library.
-+            For (2) we return the bridge list as a raw stream
-+            If length is greater than 5, then we know this is a custom bridge
-          */
-         String userDefinedBridgeList = Prefs.getBridgesList();
--        byte bridgeType = (byte) (userDefinedBridgeList.length() > 9 ? 1 : 0);
-+        byte bridgeType = (byte) (userDefinedBridgeList.length() > 5 ? 1 : 0);
-         // Terrible hack. Must keep in sync with topl::addBridgesFromResources.
-         if (bridgeType == 0) {
-             switch (userDefinedBridgeList) {
-@@ -60,9 +57,6 @@ public class CustomTorInstaller extends TorInstaller {
-                 case "meek":
-                     bridgeType = 3;
-                     break;
--                case "snowflake":
--                    bridgeType = 4;
--                    break;
-             }
-         }
- 
-diff --git a/service/src/main/java/org/torproject/android/service/TorService.java b/service/src/main/java/org/torproject/android/service/TorService.java
-index f1ddcda..32d7f30 100644
---- a/service/src/main/java/org/torproject/android/service/TorService.java
-+++ b/service/src/main/java/org/torproject/android/service/TorService.java
-@@ -365,12 +365,10 @@ public final class TorService extends Service implements TorServiceConstants, Or
- 
-             //Check bridges to see if we need this
-             File nativeDir = new File(getApplicationInfo().nativeLibraryDir);
--            File pluggableTransportObfs = new File(nativeDir, "libObfs4proxy.so");
--            if(!pluggableTransportObfs.canExecute()) pluggableTransportObfs.setExecutable(true);
--            File pluggableTransportSnow = new File(nativeDir, "libSnowflake.so");
--            if(!pluggableTransportSnow.canExecute()) pluggableTransportSnow.setExecutable(true);
-+            File pluggableTransport = new File(nativeDir, "libObfs4proxy.so");
-+            if(!pluggableTransport.canExecute()) pluggableTransport.setExecutable(true);
- 
--            builder.configurePluggableTransportsFromSettings(pluggableTransportObfs, pluggableTransportSnow);
-+            builder.configurePluggableTransportsFromSettings(pluggableTransport);
-             mDataService.updateConfigBuilder(builder);
-             onionProxyManager.getTorInstaller().updateTorConfigCustom
-                     (builder.asString());
--- 
-2.30.0
-

projects/tor-android-service/build

@@ -14,9 +14,6 @@ tar -C $GRADLE_HOME -xf $rootdir/[% c('input_files_by_name/gradle') %]
 tar -C /var/tmp/build -xf [% project %]-[% c('version') %].tar.gz
 
 cd /var/tmp/build/[% project %]-[% c('version') %]
-[% IF ! c("var/snowflake") %]
-  patch -p1 < $rootdir/0001-Revert-Bug-30318-Add-snowflake-support.patch
-[% END %]
 # Replace pre-packaged tor library with the latest build
 rm -fR service/src/main/jniLibs/*
 [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]

projects/tor-android-service/config

@@ -25,8 +25,6 @@ input_files:
     exec: '[% INCLUDE "fetch-gradle-dependencies" %]'
   - project: tor-onion-proxy-library
     name: topl
-  - filename: 0001-Revert-Bug-30318-Add-snowflake-support.patch
-    enable: '[% ! c("var/snowflake") %]'
   - project: tor
     name: tor-armv7
     target_prepend:

projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt

+Tor Browser 10.5 -- July 6 2021
+ * All Platforms
+   * Update NoScript to 11.2.9
+   * Update Tor Launcher to 0.2.29
+   * Translations update
+   * Bug 25483: Provide Snowflake based on Pion for Windows, macOS, and Linux
+   * Bug 33761: Remove unnecessary snowflake dependencies
+   * Bug 40064: Bump libevent to 2.1.12 [tor-browser-build]
+   * Bug 40137: Migrate https-everywhere storage to idb [tor-browser]
+   * Bug 40261: Bump versions of snowflake and webrtc [tor-browser-build]
+   * Bug 40263: Update domain front for Snowflake [tor-browser-build]
+   * Bug 40302: Update version of snowflake [tor-browser-build]
+   * Bug 40030: DuckDuckGo redirect to html doesn't work [torbutton]
+ * Windows + OS X + Linux
+   * Bug 27476: Implement about:torconnect captive portal within Tor Browser [tor-browser]
+   * Bug 32228: Bookmark TPO support domains in Tor Browser
+   * Bug 33803: Add a secondary nightly MAR signing key [tor-browser]
+   * Bug 33954: Consider different approach for Bug 2176
+   * Bug 34345: "Don't Bootstrap" Startup Mode
+   * Bug 40011: Rename tor-browser-brand.ftl to brand.ftl [torbutton]
+   * Bug 40012: Fix about:tor not loading some images in 82 [torbutton]
+   * Bug 40138: Move our primary nightly MAR signing key to tor-browser [tor-browser-build]
+   * Bug 40428: Correct minor Cryptocurrency warning string typo [tor-browser]
+   * Bug 40429: Update Onboarding for 10.5 [tor-browser]
+   * Bug 40455: Block or recover background requests after bootstrap [tor-browser]
+   * Bug 40456: Update the SecureDrop HTTPS-Everywhere update channel [tor-browser]
+   * Bug 40475: Include clearing CORS preflight cache [tor-browser]
+   * Bug 40478: Onion alias url rewrite is broken [tor-browser]
+   * Bug 40484: Bootstrapping page show Quickstart text [tor-browser]
+   * Bug 40490: BridgeDB bridge captcha selection is broken in alpha [tor-browser]
+   * Bug 40495: Onion pattern is focusable by click on about:torconnect [tor-browser]
+   * Bug 40499: Onion Alias doesn't work with TOR_SKIP_LAUNCH [tor-browser]
+ * Android
+   * Bug 30318: Integrate snowflake into mobile Tor Browser
+   * Bug 40206: Disable the /etc/hosts parser [tor-browser]
+ * Linux
+   * Bug 40089: Remove CentOS 6 support for Tor Browser 10.5 [tor-browser]
+ * Build System
+   * All Platforms
+     * Update Go to 1.15.13
+     * Bug 23631: Use rootless containers [tor-browser-build]
+     * Bug 33693: Change snowflake and meek dummy address [tor-browser]
+     * Bug 40016: getfpaths is not setting origin_project [rbm]
+     * Bug 40169: Update apt package cache after calling pre_pkginst, too [tor-browser-build]
+     * Bug 40194: Remove osname part in cbindgen filename [tor-browser-build]
+   * Windows + OS X + Linux
+     * Bug 40081: Build Mozilla code with --enable-rust-simd [tor-browser-build]
+     * Bug 40104: Use our TMPDIR when creating our .mar files [tor-browser-build]
+     * Bug 40133: Bump Rust version for ESR 78 to 1.43.0 [tor-browser-build]
+     * Bug 40166: Update apt cache before calling pre_pkginst in container-image config [tor-browser-build]
+   * Android
+     * Bug 28672: Android reproducible build of Snowflake
+     * Bug 40313: Use apt-get to install openjdk-8 .deb files with their dependencies [tor-browser-build]
+   * Windows
+     * Bug 34360: Bump binutils to 2.35.1
+     * Bug 40131: Remove unused binutils patches [tor-browser-build]
+   * Linux
+     * Bug 26238: Move to Debian Jessie for our Linux builds
+     * Bug 31729: Support Wayland
+     * Bug 40041: Remove CentOS 6 support for 10.5 series [tor-browser-build]
+     * Bug 40103: Add i386 pkg-config path for linux-i686 [tor-browser-build]
+     * Bug 40112: Strip libstdc++ we ship [tor-browser-build]
+     * Bug 40118: Add missing libdrm dev package to firefox container [tor-browser-build]
+     * Bug 40235: Bump apt for Jessie containers [tor-browser-build]
+
 Tor Browser 10.5a17 -- June 27 2021
  * All Platforms
    * Update NoScript to 11.2.9

projects/tor-browser/build

@@ -48,9 +48,7 @@ MARTOOLS=$rootdir/mar-tools
 mv [% c('input_files_by_name/noscript') %] "$TBDIR/$EXTSPATH/{73a6fe31-595d-460b-a920-fcc0f8843232}.xpi"
 
 tar -C "$TBDIR" -xf [% c('input_files_by_name/obfs4') %]
-[% IF c("var/snowflake") %]
-  tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%]
-[% END -%]
+tar -C "$TBDIR" -xf [% c('input_files_by_name/snowflake') -%]
 
 tar -C "$TBDIR[% IF c("var/osx") %]/Contents/Resources[% END %]" -xf [% c('input_files_by_name/fonts') %]
 
@@ -135,12 +133,7 @@ cp -a Bundle-Data/Docs/* "$TBDIR/$DOCSPATH"
 tar -C Bundle-Data/[% bundledata_osname %] [% IF ! c("var/namecoin") %]--exclude=*Electrum-NMC* --exclude=*ncprop279*[% END %] -c . | tar -C "$TBDIR[% IF ! c("var/osx") %]/TorBrowser[% END %]" -x
 
 cat Bundle-Data/PTConfigs/[% bundledata_osname %]/torrc-defaults-appendix >> "$TBDIR/$TORCONFIGPATH/torrc-defaults"
-[% IF ! c("var/snowflake") %]
-  grep -v 'default_bridge\.snowflake' Bundle-Data/PTConfigs/bridge_prefs.js \
-    >> "$GENERATEDPREFSPATH"
-[% ELSE %]
-  cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH"
-[% END %]
+cat Bundle-Data/PTConfigs/bridge_prefs.js >> "$GENERATEDPREFSPATH"
 
 [% IF ! c("var/multi_lingual") %]
   echo 'pref("extensions.torlauncher.prompt_for_locale", false);' >> "$GENERATEDPREFSPATH"

projects/tor-browser/config

@@ -75,7 +75,7 @@ input_files:
     enable: '[% ! c("var/android") %]'
   - project: snowflake
     name: snowflake
-    enable: '[% c("var/snowflake") && ! c("var/android") %]'
+    enable: '[% ! c("var/android") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
   - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.9-an+fx.xpi

projects/tor-launcher/config

 # vim: filetype=yaml sw=2
-version: 0.2.29
+version: 0.2.30
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg

projects/tor-onion-proxy-library/build

@@ -21,42 +21,30 @@ cd /var/tmp/build/[% project %]-[% c('version') %]
 # build will pull down the correct android tool versions
 patch -p1 < $rootdir/gradle.patch
 patch -p1 < $rootdir/0001-Bug-33931-Filter-bridges-in-stream-by-type.patch
-[% IF c("var/snowflake") %]
-  patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch
-[% END %]
+patch -p1 < $rootdir/0001-Bug-30318-Add-snowflake-support.patch
 
 [% FOREACH arch = ['armv7', 'aarch64', 'x86', 'x86_64'] -%]
   # Extract obfs4proxy from TorBrowser/Tor/PluggableTransports/obfs4proxy
   tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/obfs4-' _ arch) %]
 
-  [% IF c("var/snowflake") %]
-    # Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake
-    tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake-' _ arch) %]
-  [% END %]
+  # Extract snowflake from TorBrowser/Tor/PluggableTransports/snowflake
+  tar --strip-components=4 -xf $rootdir/[% c('input_files_by_name/snowflake-' _ arch) %]
   # Overwrite the obfs4proxy binary provided by Pluto and add Snowflake
   [% IF arch == "armv7" -%]
     cp obfs4proxy external/pluto/bin/armeabi-v7a/
     cp obfs4proxy external/pluto/bin/armeabi/
-    [% IF c("var/snowflake") %]
-      cp snowflake-client external/pluto/bin/armeabi-v7a/
-      cp snowflake-client external/pluto/bin/armeabi/
-    [% END %]
+    cp snowflake-client external/pluto/bin/armeabi-v7a/
+    cp snowflake-client external/pluto/bin/armeabi/
   [% ELSIF arch == "aarch64" -%]
     cp obfs4proxy external/pluto/bin/arm64-v8a/
-    [% IF c("var/snowflake") %]
-      cp snowflake-client external/pluto/bin/arm64-v8a/
-    [% END %]
+    cp snowflake-client external/pluto/bin/arm64-v8a/
   [% ELSE -%]
     cp obfs4proxy external/pluto/bin/[% arch %]/
-    [% IF c("var/snowflake") %]
-      cp snowflake-client external/pluto/bin/[% arch %]/
-    [% END %]
+    cp snowflake-client external/pluto/bin/[% arch %]/
   [% END -%]
 
   rm obfs4proxy
-  [% IF c("var/snowflake") %]
-    rm snowflake-client
-  [% END %]
+  rm snowflake-client
 [% END -%]
 
 # Build Android Libraries and Apps

projects/tor-onion-proxy-library/config

@@ -42,26 +42,21 @@ input_files:
     name: snowflake-armv7
     target_prepend:
       - android-armv7
-    enable: '[% c("var/snowflake") %]'
   - project: snowflake
     name: snowflake-aarch64
     target_prepend:
       - android-aarch64
-    enable: '[% c("var/snowflake") %]'
   - project: snowflake
     name: snowflake-x86
     target_prepend:
       - android-x86
-    enable: '[% c("var/snowflake") %]'
   - project: snowflake
     name: snowflake-x86_64
     target_prepend:
       - android-x86_64
-    enable: '[% c("var/snowflake") %]'
   - filename: 'gradle-dependencies-[% c("var/gradle_dependencies_version") %]'
     name: gradle-dependencies
     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
-    enable: '[% c("var/snowflake") %]'

projects/tor/config

 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.4.6.5
+version: 0.4.5.9
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1

rbm.conf

@@ -57,10 +57,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.5a17'
-  torbrowser_build: 'build2'
+  torbrowser_version: '10.5'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.5a16
+    - 10.0.18
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1
@@ -323,9 +323,6 @@ targets:
       android_min_api_aarch64: 21
       # This is needed to get the offline build part for Glean right.
       glean_parser: 1.29.0
-      # We only build snowflake on the alpha and nightly
-      # channels for now.
-      snowflake: '[% c("var/alpha") || c("var/nightly") %]'
       container:
         suite: buster
         arch: amd64
@@ -380,9 +377,6 @@ targets:
       linux: 1
       compiler: gcc
       configure_opt: '[% c("var/configure_opt_project") %]'
-      # We only build snowflake on the alpha and nightly
-      # channels for now.
-      snowflake: '[% c("var/alpha") || c("var/nightly") %]'
       # Only build Namecoin for linux on nightly
       namecoin: '[% c("var/nightly") %]'
       container:
@@ -442,9 +436,6 @@ targets:
       flag_mwindows: '-mwindows'
       compiler: mingw-w64
       faketime_path: /usr/lib/x86_64-linux-gnu/faketime/libfaketime.so.1
-      # We only build snowflake on the alpha and nightly
-      # channels for now.
-      snowflake: '[% c("var/alpha") || c("var/nightly") %]'
       deps:
         - build-essential
         - python
@@ -472,9 +463,6 @@ targets:
       locale_ja: ja-JP-mac
       # We only support RLBox on the nightly channel for now
       rlbox: '[% c("var/nightly") %]'
-      # We only build snowflake on the alpha and nightly
-      # channels for now.
-      snowflake: '[% c("var/alpha") || c("var/nightly") %]'
       deps:
         - build-essential
         - python