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

[gk at torproject.org]

commit 4eb612dea332b0cea783267ec55790d88846b74c
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Mar 18 15:17:17 2021 +0000

    Release preparation for 10.0.14
    
    Versions bump and Changelog update
---
 projects/firefox-langpacks/config                   |  2 +-
 projects/firefox/config                             |  4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 10 ++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor/config                                 |  2 +-
 rbm.conf                                            |  3 ++-
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 17a707a..34d6fad 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build2
+  ff_build: build1
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox/config b/projects/firefox/config
index 035ccca..0830aa0 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,14 +1,14 @@
 # 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-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 78.8.0
+  firefox_platform_version: 78.9.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 10.0
   branding_directory: 'browser/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 426c0c3..617a77a 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,13 @@
+Tor Browser 10.0.14 -- March 23 2021
+ * Windows + OS X + Linux
+   * Update Firefox to 78.9.0esr
+   * Update NoScript to 11.2.3
+   * Update Tor to 0.4.5.7
+   * Bug 40031: Remove survey banner on TB-stable [torbutton]
+ * Build System
+   * Windows
+     * Bug 40249: Bump mingw-w64 and clang for Firefox 78.9 [tor-browser-build]
+
 Tor Browser 10.0.13 -- March 3 2021
  * Linux
    * Bug 40328: Fix instability after upgrading to glibc 2.33 [tor-browser]
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index acd0dff..20d920d 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.2-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.3-an+fx.xpi
     name: noscript
-    sha256sum: 1d8126b5b76229d98b7f531879a1f59d16eecca32f8d6cede4d7ff9113f4e41a
+    sha256sum: eafc5f5be40d33a34d757940b5391455dad166921c880ee67daab056078d51ae
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor/config b/projects/tor/config
index ab5458a..edd6391 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.5.6
+version: 0.4.5.7
 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 ba4baa0..e0e2c7b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.0.13'
+  torbrowser_version: '10.0.14'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 10.0.12
+    - 10.0.13
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1