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

4 Jan 2020

commit 8e09c52c4dbb0f2879fba661f49889847a308c2c
Author: Matthew Finkel sysrqb@torproject.org
Date:   Sat Jan 4 22:10:03 2020 +0000
Release preparations for 9.5a4
Changelog update and versions bump
---
 projects/firefox-langpacks/config                  |  2 +-
 projects/firefox-locale-bundle/config              |  2 +-
 projects/firefox/config                            |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 23 ++++++++++++++++++++++
 projects/tor-browser/config                        |  4 ++--
 projects/tor-launcher/config                       |  2 +-
 projects/tor/config                                |  2 +-
 rbm.conf                                           |  4 ++--
 8 files changed, 32 insertions(+), 9 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-locale-bundle/config b/projects/firefox-locale-bundle/config
index 2ea6db6..2f4997f 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: build1
diff --git a/projects/firefox/config b/projects/firefox/config
index 0931a3f..9082c04 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -8,7 +8,7 @@ git_submodule: 1
 gpg_keyring: torbutton.gpg
var:
-  firefox_platform_version: 68.3.0
+  firefox_platform_version: 68.4.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 fd891e0..48c4249 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,26 @@
+ Tor Browser 9.5a4 -- January 7 2020
+ * All Platforms
+   * Update Firefox to 68.4.0esr
+   * Bump NoScript to 11.0.11
+   * Translations update
+   * Update OpenPGP keyring
+   * Bug 31134: Govern graphite again by security settings
+   * Bug 31855: Remove End of Year Fundraising Campaign from about:tor
+   * Bug 32053: Fix LLVM reproducibility issues
+   * Bug 32547: Add new default bridge at UMN
+   * Bug 32659: Remove IPv6 address of default bridge
+ * Windows + OS X + Linux
+   * Update Tor to 0.4.2.5
+   * Update Tor Launcher to 0.2.21
+     * Bug 32636: Clean up locales shipped with Tor Launcher
+     * Translations update
+   * Bug 32674: Point the about:tor "Get involved" link to the community portal
+ * Build System
+   * All Platforms
+     * Bump clang to 8.0.1
+   * Linux
+     * Bug 32676: Create a tarball with all Linux x86_64 language packs
+
 Tor Browser 9.0.2 -- December 3 2019
  * All Platforms
    * Update Firefox to 68.3.0esr
diff --git a/projects/tor-browser/config b/projects/tor-browser/config
index 85d8bff..d3e8e61 100644
--- a/projects/tor-browser/config
+++ b/projects/tor-browser/config
@@ -74,9 +74,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...
+  - URL: https://addons.cdn.mozilla.net/user-media/addons/722/noscript_security_suite...
     name: noscript
-    sha256sum: 1522903c3486c790e842f9d5204cfbc93672676df4090f99c4d1ee3578ac8c07
+    sha256sum: 1b0daa12e1b8fbc8e30e7bdb5689b12774aaa9f883cb3e9ad57943a883ce65b5
   - 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 f253c09..874ad15 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.20.3
+version: 0.2.21
 git_url: https://git.torproject.org/tor-launcher.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/projects/tor/config b/projects/tor/config
index 7058eda..4a1045c 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.2.4-rc
+version: 0.4.2.5
 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 31f60bb..5ac3328 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
var:
-  torbrowser_version: '9.5a3'
+  torbrowser_version: '9.5a4'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.5a2
+    - 9.5a3
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1

    