[tor-commits] [tor-browser-build/maint-10.5] Tor Browser 10.5.4 release preparations

[boklm at torproject.org]

commit 9b3892532ac96593997afbf16ca8642cd84a51a6
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Wed Aug 4 18:15:11 2021 +0000

    Tor Browser 10.5.4 release preparations
    
    Version bumps and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/go/config                                  |  4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++
 projects/tor-browser/config                         |  4 ++--
 rbm.conf                                            |  4 ++--
 5 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index d62d9ab..1837c5c 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.12.0
+  firefox_platform_version: 78.13.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.5
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/go/config b/projects/go/config
index 8a67ae8..9572cd2 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.15.13
+version: 1.15.14
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -118,7 +118,7 @@ input_files:
     enable: '[% ! c("var/linux") %]'
   - URL: 'https://golang.org/dl/go[% c("version") %].src.tar.gz'
     name: go
-    sha256sum: 99069e7223479cce4553f84f874b9345f6f4045f27cf5089489b546da619a244
+    sha256sum: 60a4a5c48d63d0a13eca8849009b624629ff429c8bc5d1a6a8c3c4da9f34e70a
   - URL: 'https://golang.org/dl/go[% c("var/go14_version") %].src.tar.gz'
     name: go14
     sha256sum: 9947fc705b0b841b5938c48b22dc33e9647ec0752bae66e50278df4f23f64959
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 5eca79f..bc768d0 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 10.5.4 -- August 10 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 78.13.0esr
+   * Update NoScript to 11.2.11
+   * Bug 40041: Remove V2 Deprecation banner on about:tor for desktop [torbutton]
+   * Bug 40506: Saved Logins not available in 10.5 [tor-browser]
+   * Bug 40524: Update DuckDuckGo onion site URL in search preferences and onboarding [tor-browser]
+ * Build System
+   * Windows + OS X + Linux
+     * Update Go to 1.15.14
+
 Tor Browser 10.5.3 -- July 17 2021
  * Android
    * Update HTTPS Everywhere to 2021.7.13
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 1045d90..4091361 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -78,9 +78,9 @@ input_files:
     enable: '[% ! c("var/android") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.9-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.11-an+fx.xpi
     name: noscript
-    sha256sum: 830a25dad07327ae220b4740ea834b0abe715e9ef3dabc326bf7fef2c5af1efb
+    sha256sum: b833e81823986646dbc473ebbee987bd47757fbe79c9d1720150f08ba6ca9ba9
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 5972405..95ec20a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -57,11 +57,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.5.3'
+  torbrowser_version: '10.5.4'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.0.18
     - 10.5
+    - 10.5.2
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1