From d268b64f6e1d627d39c53775eaf5773be9850811 Mon Sep 17 00:00:00 2001
From: Matthew Finkel <sysrqb@torproject.org>
Date: Wed, 20 Jan 2021 17:52:22 +0000
Subject: [PATCH] Tor Browser 10.0.9 release preparations

Version bumps and Changelog update
---
 projects/firefox/config                             | 2 +-
 projects/go/config                                  | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++
 projects/tor-browser/config                         | 4 ++--
 rbm.conf                                            | 3 ++-
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 04ea3843..f0ea1f44 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.6.1
+  firefox_platform_version: 78.7.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/go/config b/projects/go/config
index 1651b90e..f22c2838 100644
--- a/projects/go/config
+++ b/projects/go/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.14.13
+version: 1.14.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: ba1d244c6b5c0ed04aa0d7856d06aceb89ed31b895de6ff783efb1cc8ab6b177
+    sha256sum: 6204bf32f58fae0853f47f1bd0c51d9e0ac11f1ffb406bed07a0a8b016c8a76f
   - 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 90989b82..384b2e18 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,12 @@
+Tor Browser 10.0.9 -- January 26 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 78.7.0esr
+   * Update NoScript to 11.1.8
+   * Bug 40249: Remove EOY 2020 Campaign [tor-browser]
+ * Build System
+   * Windows + OS X + Linux
+     * Update Go to 1.14.14
+
 Tor Browser 10.0.8 -- January 12 2021
  * Windows + OS X + Linux
    * Update Firefox to 78.6.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 2aa9849b..35d53f0f 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -77,9 +77,9 @@ input_files:
     enable: '[% c("var/snowflake") && ! c("var/android") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.1.7-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.1.9-an+fx.xpi
     name: noscript
-    sha256sum: 9d65fc25020aa1f02d9a80112227cd4c1e4588db6d87372d87a8f15132084c43
+    sha256sum: 5f68a63637e286433089aeb3b6a0aa930317dd988184876b5d6dcff2ca07bb34
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 678f9b2e..bb941192 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.8'
+  torbrowser_version: '10.0.9'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.0.7
+    - 10.0.8
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1
-- 
GitLab