[tbb-commits] [tor-browser-build/maint-9.0] Release preparations for 9.0.5

[sysrqb at torproject.org]

commit 06470dd9dc737547d43b1e15b96b441b0601add4
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Feb 6 14:28:17 2020 +0000

    Release preparations for 9.0.5
    
    Versions bump and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 12 ++++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor/config                                 |  2 +-
 rbm.conf                                            |  5 ++---
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index f50af8c..ccb9ec8 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.4.1
+  firefox_platform_version: 68.5.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.0
   torbrowser_update_channel: alpha
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 78dd726..9ad5b4f 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,15 @@
+Tor Browser 9.0.5 -- February 11 2020
+ * All Platforms
+   * Update Firefox to 68.5.0esr
+   * Bump NoScript to 11.0.13
+   * Bug 32053: Fix LLVM reproducibility issues
+   * Bug 32255: Missing ORIGIN header breaks CORS
+   * Bug 32891: Add new default bridges
+ * Windows + OS X + Linux
+   * Bump Tor to 0.4.2.6
+ * Windows
+   * Bug 32132: Re-enable jemalloc for Windows users
+
 Tor Browser 9.0.4 -- January 9 2020
  * All Platforms
    * Update Firefox to 68.4.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index c4de769..4e8ee14 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.11-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.13-an+fx.xpi
     name: noscript
-    sha256sum: 1b0daa12e1b8fbc8e30e7bdb5689b12774aaa9f883cb3e9ad57943a883ce65b5
+    sha256sum: ced718d9d9e719547db392ad85d24a7ad5c6b54cc0f93f9c57f2fcb44bb4de56
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor/config b/projects/tor/config
index 4a1045c..45e2a63 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.2.5
+version: 0.4.2.6
 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 d8fccd1..c394689 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.0.4'
+  torbrowser_version: '9.0.5'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.0.2
-    - 9.0.3
+    - 9.0.4
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1