[tbb-commits] [tor-browser-build/maint-10.0-desktop] Release preparation for 10.0.12

[sysrqb at torproject.org]

commit 69048ef4b7eb19936019566597da0fad4529cd29
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue Feb 16 23:33:31 2021 +0000

    Release preparation for 10.0.12
    
    Versions bump and Changelog update
---
 projects/firefox/config                             | 2 +-
 projects/openssl/config                             | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 9 +++++++++
 projects/tor-browser/config                         | 4 ++--
 projects/tor/config                                 | 2 +-
 rbm.conf                                            | 4 ++--
 6 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 4aa0f72..a7e705b 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.7.1
+  firefox_platform_version: 78.8.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/openssl/config b/projects/openssl/config
index c753485..86f1357 100644
--- a/projects/openssl/config
+++ b/projects/openssl/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 1.1.1i
+version: 1.1.1j
 filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
 
 var:
@@ -31,4 +31,4 @@ input_files:
   - name: '[% c("var/compiler") %]'
     project: '[% c("var/compiler") %]'
   - URL: 'https://www.openssl.org/source/openssl-[% c("version") %].tar.gz'
-    sha256sum: e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
+    sha256sum: aaf2fcb575cdf6491b98ab4829abf78a3dec8402b8b81efc8f23c00d443981bf
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 3342c5e..b763127 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.12 -- February 23 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 78.8.0esr
+   * Update NoScript to 11.2.2
+   * Update Openssl to 1.1.1j
+   * Update Tor to 0.4.5.6
+   * Bug 40026: Create survey banner on about:tor for desktop [torbutton]
+   * Bug 40287: Switch DDG search from POST to GET [tor-browser]
+
 Tor Browser 10.0.11 -- February 6 2021
  * Windows
    * Update Firefox to 78.7.1esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index f3fab28..acd0dff 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.2-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.2-an+fx.xpi
     name: noscript
-    sha256sum: 4258bcd0bcdfc8ecb231d250e3adf1c477a1a672ede74a5cd10ba05a5381babb
+    sha256sum: 1d8126b5b76229d98b7f531879a1f59d16eecca32f8d6cede4d7ff9113f4e41a
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor/config b/projects/tor/config
index 3050d7d..ab5458a 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.4.6
+version: 0.4.5.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 368fa3a..fa1dcba 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.11'
+  torbrowser_version: '10.0.12'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.0.9
     - 10.0.10
+    - 10.0.11
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1