[tbb-commits] [tor-browser-build/maint-9.5] Release prep for 9.5.4

[gk at torproject.org]

commit 665da21ee7ad20876ccc8d635ba100e6381ea42c
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Aug 18 09:58:01 2020 +0000

    Release prep for 9.5.4
    
    Changelog update and versions bump
---
 projects/firefox/config                             | 2 +-
 projects/https-everywhere/config                    | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 ++++++++
 projects/tor-browser/config                         | 4 ++--
 rbm.conf                                            | 4 ++--
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 022eea9..5ef60e0 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.11.0
+  firefox_platform_version: 68.12.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/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 0e14dae..cbd5459 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,11 @@
+Tor Browser 9.5.4 -- August 25 2020
+ * All Platforms
+   * Update Firefox to 68.12.0esr
+   * Update HTTPS Everywhere to 2020.08.13
+   * Update NoScript to 11.0.38
+ * Windows + OS X + Linux
+   * Bug 40019: Onion-Location should not be processed on .onion webpages [tor-browser]
+
 Tor Browser 9.5.3 -- July 28 2020
  * All Platforms
    * Update Firefox to 68.11.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 9254cf6..d913beb 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.34-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.38-an+fx.xpi
     name: noscript
-    sha256sum: 759a38df3ef121804bf8933ab5289ec8452d5663fcad2f484b73095d8b488578
+    sha256sum: 8cf8957dad3dc3aaad29f8cbeb8a519f364027e817a51f7bf64a0089036ce738
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 111ea70..9f6d6d3 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5.3'
+  torbrowser_version: '9.5.4'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5.1
+    - 9.5.3
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1