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

[sysrqb at torproject.org]

commit d3c7af80c77facabb2633927e264f16723ce983b
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sun Aug 23 18:42:11 2020 +0000

    Release preparations for 10.0a6
    
    Versions bump and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/https-everywhere/config                    |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 20 ++++++++++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor-launcher/config                        |  2 +-
 rbm.conf                                            |  4 ++--
 6 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index d42474b..aa34b7e 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 78.1.0
+  firefox_platform_version: 78.2.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/https-everywhere/config b/projects/https-everywhere/config
index a5be759..ec8669f 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2020.5.20
+version: 2020.8.13
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 096e0d7..52f3b3c 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,23 @@
+Tor Browser 10.0a6 -- August 26 2020
+ * Windows + OS X + Linux
+   * Update Firefox to 78.2.0esr
+   * Update Tor Launcher to 0.2.23
+     * Translations update
+	 * Bug 40002: After rebasing to 80.0b2 moat is broken [tor-launcher]
+   * Update NoScript to 11.0.39
+   * Bug 21601: Remove unused media.webaudio.enabled pref
+   * Bug 40002: Remove about:pioneer [tor-browser]
+   * Bug 40082: Let JavaScript on safest setting handled by NoScript again [tor-browser]
+   * Bug 40088: Moat "Submit" button does not work
+   * Bug 40090: Disable v3 add-on blocklist for now [tor-browser]
+ * OS X
+   * Bug 40015: Tor Browser broken on MacOS 11 Big Sur
+ * Build System
+   * Windows + OS X + Linux
+     * Bump Go to 1.13.15
+   * Linux
+     * Bug 40053: Also create the langpacks tarball for non-release builds [tor-browser-build]
+
 Tor Browser 10.0a5 -- August 18 2020
  * Windows + OS X + Linux
    * Update Firefox to 78.1.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 251b1ca..fc81a4f 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.37-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.39-an+fx.xpi
     name: noscript
-    sha256sum: fed4b7554da3e334c32f27d155967fd1bc40e7b80941290bb9a57bb3f40e7480
+    sha256sum: d0ade42bee14ea2498cf8868c2d0ef2d5acae563d22cb788b33a86b80e7f7b5e
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index ba799c5..95a2f02 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.22
+version: 0.2.23
 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 8f1143e..ab73841 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0a5'
+  torbrowser_version: '10.0a6'
   torbrowser_build: 'build2'
   torbrowser_incremental_from:
-    - 10.0a4
+    - 10.0a5
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1