[tbb-commits] [tor-browser-build/master] Release preparations for 10.5a14

[gk at torproject.org]

commit 84363aa2e6cc52298f1194d7b6708739b0bf7559
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Fri Apr 9 17:32:50 2021 +0000

    Release preparations for 10.5a14
    
    Versions bump and Changelog update
---
 projects/firefox/config                             |  2 +-
 projects/geckoview/config                           |  2 +-
 projects/tba-translation/config                     |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 10 ++++++++++
 projects/tor-browser/config                         |  4 ++--
 projects/tor-launcher/config                        |  2 +-
 rbm.conf                                            |  4 ++--
 7 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 19d087a..1abd993 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,7 +1,7 @@
 # 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-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
diff --git a/projects/geckoview/config b/projects/geckoview/config
index f8c97e5..d9bc3f8 100644
--- a/projects/geckoview/config
+++ b/projects/geckoview/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 git_submodule: 1
diff --git a/projects/tba-translation/config b/projects/tba-translation/config
index 76c8d3f..73b5369 100644
--- a/projects/tba-translation/config
+++ b/projects/tba-translation/config
@@ -3,5 +3,5 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: https://git.torproject.org/translation.git
 # We need to bump the commit before releasing but just pointing to a branch
 # might cause too much rebuidling of the Firefox part.
-git_hash: 75a88b97c88d73d0d94a962a75703f0c33f8087c
+git_hash: 0480d9e3ada42bfb02a77be59a54682ce2179cff
 version: '[% c("abbrev") %]'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 55b98a3..f1a094a 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.5a14 -- April 11 2021
+ * All Platforms
+   * Update NoScript to 11.2.4
+   * Translations update
+   * Bug 40261: Bump versions of snowflake and webrtc [tor-browser-build]
+   * Bug 40263: Update domain front for Snowflake [tor-browser-build]
+   * Bug 40390: Add Burmese as a new locale [tor-browser]
+ * Windows + OS X + Linux
+   * Bug 40007: Update domain fronting config for Moat [tor-launcher]
+
 Tor Browser 10.5a13 -- March 24 2021
  * Windows + OS X + Linux
    * Update Firefox to 78.9.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 29eb20f..58cf4bc 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -78,9 +78,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.3-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.2.4-an+fx.xpi
     name: noscript
-    sha256sum: eafc5f5be40d33a34d757940b5391455dad166921c880ee67daab056078d51ae
+    sha256sum: 278ee526d7c3ce5236c1a04aa5b6605c81b82399b846e43cdf6f93f11fef1ec9
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 5413e9a..1ebf3e1 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.27
+version: 0.2.28
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index 8c577a0..8751f7a 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '10.5a13'
+  torbrowser_version: '10.5a14'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 10.5a11
+    - 10.5a13
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1