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

[sysrqb at torproject.org]

commit cdc5890c358806b107f72479b4792a3865ba31ee
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Mon Mar 23 16:50:34 2020 +0000

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

diff --git a/projects/firefox/config b/projects/firefox/config
index f7efacc..0dad227 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # 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-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 247e8f6..2c95450 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,14 @@
+Tor Browser 9.5a9 -- March 25 2020
+ * All Platforms
+   * Translations update
+   * Bump NoScript to 11.0.21
+   * Bug 33613: Disable Javascript on Safest security level
+   * Bug 33342: Avoid disconnect search addon error after removal
+ * Windows + OS X + Linux
+   * Bump Tor to 0.4.3.3-alpha
+   * Update Tor Launcher to 0.2.21.5
+     * Translations update
+
 Tor Browser 9.5a8 -- March 13 2020
  * All Platforms
    * Update Firefox to 68.6.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 4888399..2c9eabf 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.15-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.21-an+fx.xpi
     name: noscript
-    sha256sum: 5e795f711275f9162957321e5245cb0176ce36ce8a2410de95496670af51603d
+    sha256sum: 00ee2dab3951a9afe3d255c38669114b676f3176e1efd6bba5eacd69cb18fd5b
   - 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 84c5b17..e0f0113 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.21.3
+version: 0.2.21.5
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index 9b5ba3d..a491ba0 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.2-alpha
+version: 0.4.3.3-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 f8d1d0b..9a9888f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5a8'
+  torbrowser_version: '9.5a9'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5a6
     - 9.5a7
+    - 9.5a8
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1