[tbb-commits] [tor-browser-build/master] Release preparations for 9.5a8

[sysrqb at torproject.org]

commit 7a9ec7814d44ba760be5554c66b68e517d0b946b
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Wed Mar 11 20:54:32 2020 +0000

    Release preparations for 9.5a8
    
    Versions bump and Changelog update
---
 projects/firefox/config                             |  4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++++
 projects/tor-browser/config                         |  4 ++--
 rbm.conf                                            |  6 +++---
 4 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 13c9307..f7efacc 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # 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-build4'
+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.5.0
+  firefox_platform_version: 68.6.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.5
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 7d7ad9f..eadcd2a 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,16 @@
+Tor Browser 9.5a8 -- March 13 2020
+ * All Platforms
+   * Update Firefox to 68.6.0esr
+   * Bump NoScript to 11.0.15
+     * Bug 33430: Disable downloadable fonts on Safest security level
+   * Translations update
+ * Windows + OS X + Linux
+   * Update Tor Launcher to 0.2.21.4
+     * Translations update
+ * Build System
+   * Windows
+     * Bug 33535: Patch openssl to use SOURCE_DATE_EPOCH for copyright year
+
 Tor Browser 9.5a7 -- March 6 2020
  * All Platforms
    * Translations update
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index eaacff7..4888399 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -73,9 +73,9 @@ input_files:
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.13-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.15-an+fx.xpi
     name: noscript
-    sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56
+    sha256sum: 5e795f711275f9162957321e5245cb0176ce36ce8a2410de95496670af51603d
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 106c669..f8d1d0b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5a7'
-  torbrowser_build: 'build2'
+  torbrowser_version: '9.5a8'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5a5
     - 9.5a6
+    - 9.5a7
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1