[tbb-commits] [tor-browser-build/master] Release preparations for 9.5a11

[sysrqb at torproject.org]

commit ae7dbafe946855273052ee73f4c4052e3055c1c3
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Sun Apr 5 15:29:25 2020 +0000

    Release preparations for 9.5a11
    
    Versions bump and Changelog update. Version 9.5a10 was used for a
    security release.
---
 projects/firefox-langpacks/config                   | 2 +-
 projects/firefox-locale-bundle/config               | 2 +-
 projects/firefox/config                             | 4 ++--
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 +++++++-
 projects/tor-browser/config                         | 4 ++--
 rbm.conf                                            | 6 +++---
 6 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 17a707a..2d55896 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: build3
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
 targets:
diff --git a/projects/firefox-locale-bundle/config b/projects/firefox-locale-bundle/config
index 2ea6db6..b2d33a8 100644
--- a/projects/firefox-locale-bundle/config
+++ b/projects/firefox-locale-bundle/config
@@ -5,4 +5,4 @@ filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 var:
   use_container: 0
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build2
+  ff_build: build3
diff --git a/projects/firefox/config b/projects/firefox/config
index 0dad227..02b1908 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: 68.6.0
+  firefox_platform_version: 68.7.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 9.5
   branding_directory: '[% IF c("var/android") %]mobile/android[% ELSE %]browser[% END %]/branding/alpha'
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 197be60..4e869b4 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,6 +1,9 @@
-Tor Browser 9.5a10 -- April XX 2020
+Tor Browser 9.5a11 -- April 8 2020
  * All Platforms
+   * Update Firefox to 68.7.0esr
    * Bump Https-Everywhere to 2020.3.16
+   * Bump NoScript to 11.0.23
+   * Translations update
    * Bug 33342: Avoid disconnect search addon error after removal
    * Bug 33482: Update about:tor donate string
    * Bug 33630: Remove noisebridge01 default bridge
@@ -15,6 +18,9 @@ Tor Browser 9.5a10 -- April XX 2020
    * Bug 33723: Bump openssl version to 1.1.1f
    * Bug 33761: Remove unnecessary snowflake dependencies
    * Bug 33771: Update some existing licenses and add Libevent license
+ * Build System
+   * Windows
+     * Bug 33805: Remove escape-openssldir.patch
 
 Tor Browser 9.5a9 -- March 25 2020
  * All Platforms
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 2c9eabf..1e93680 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -73,9 +73,9 @@ input_files:
     enable: '[% c("var/snowflake") %]'
   - filename: Bundle-Data
     enable: '[% ! c("var/android") %]'
-  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.21-an+fx.xpi
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite-11.0.23-an+fx.xpi
     name: noscript
-    sha256sum: 00ee2dab3951a9afe3d255c38669114b676f3176e1efd6bba5eacd69cb18fd5b
+    sha256sum: 3f046da13f487392f34858f8a5e2fc24d7d87ff19e98a3a7907f59baff8a3705
   - filename: 'RelativeLink/start-tor-browser.desktop'
     enable: '[% c("var/linux") %]'
   - filename: 'RelativeLink/execdesktop'
diff --git a/rbm.conf b/rbm.conf
index 9a9888f..564dff4 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,11 +24,11 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5a9'
+  torbrowser_version: '9.5a11'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5a7
-    - 9.5a8
+    - 9.5a9
+    - 9.5a10
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1