[tbb-commits] [tor-browser-build/master] Release preparations for 10.0a2

[sysrqb at torproject.org]

commit a0cf2d77e652d2c5188c1e11b613d04e5d47da1b
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Jun 26 17:56:29 2020 +0000

    Release preparations for 10.0a2
    
    Versions bump and Changelog update.
---
 projects/firefox/config                             |  2 +-
 projects/tba-translation/config                     |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 17 +++++++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor/config                                 |  2 +-
 rbm.conf                                            |  4 ++--
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index a64763e..019dfc1 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 68.9.0
+  firefox_platform_version: 68.10.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index ab5c04e..520f570 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: d5bd416ac0cda30893e18f2eb511514bd2e698bd
+git_hash: e93401f698cca39971395625e1f8de54b978ab88
 version: '[% c("abbrev") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 224248c..e9126c2 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,20 @@
+Tor Browser 10.0a2 -- June 30 2020
+ * All Platforms
+   * Update Firefox to 68.10.0esr
+   * Update NoScript to 11.0.32
+   * Update Tor to 0.4.4.1-alpha
+   * Translations update
+   * Bug 34209: about:tor and about:tbupdate fail to load in debug build
+   * Bug 34250: Only listen to 'started' in noscript-control.js
+   * Bug 34383: Accept request if GetHost() in mixed content blocking check fails
+ * Windows + OS X + Linux
+   * Bug 34361: "Prioritize .onion sites when known" appears under General
+   * Bug 34362: Improve Onion Service Authentication prompt
+   * Bug 34369: Fix learn more link in Onion Auth prompt
+   * Bug 34379: Fix learn more for Onion-Location
+ * Android
+   * Bug 34372: Disable GeckoNetworkManager
+
 Tor Browser 10.0a1 -- June 2 2020
  * All Platforms
    * Update Firefox to 68.9.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 809bfa0..da6e40b 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -73,9 +73,9 @@ input_files:
     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_suite-11.0.26-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.32-an+fx.xpi
     name: noscript
-    sha256sum: 99a70a78733fe7e21852f67bde090f6a57b5bdbd34ecbbdfcf481dc861965fd8
+    sha256sum: 088c0b0f08529d88aacee3b1c09cfafe304b98cb2847c3fc255e05d1bf10bd6d
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor/config b/projects/tor/config
index 912f839..72d7a8a 100644
--- a/projects/tor/config
+++ b/projects/tor/config
@@ -1,6 +1,6 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]'
-version: 0.4.3.5
+version: 0.4.4.1-alpha
 git_hash: 'tor-[% c("version") %]'
 git_url: https://git.torproject.org/tor.git
 git_submodule: 1
diff --git a/rbm.conf b/rbm.conf
index d0afe9a..0ccfc9d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0a1'
+  torbrowser_version: '10.0a2'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5a13
+    - 10.0a1
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1