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

[gk at torproject.org]

commit c6b664f549650a07d63c7fc8695bbdc03c515f27
Author: Georg Koppen <gk at torproject.org>
Date:   Sat Oct 19 21:14:37 2019 +0000

    Release preparations for 9.5a1
    
    Changelog update and versions bump
---
 projects/firefox/config                            |  2 +-
 .../tor-browser/Bundle-Data/Docs/ChangeLog.txt     | 33 ++++++++++++++++++++++
 projects/tor-launcher/config                       |  2 +-
 rbm.conf                                           |  6 ++--
 4 files changed, 38 insertions(+), 5 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index fe1b5d4..c30a71f 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") %]-2-build5'
+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
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 2930090..4d52fd2 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,36 @@
+Tor Browser 9.5a1 -- October 23 2019
+ * All Platforms
+   * Update Firefox to 68.2.0esr
+   * Bug 31740: Remove some unnecessary RemoteSettings instances
+   * Bug 30681: Set security.enterprise_roots.enabled to false
+   * Bug 31144: Review network code changes for Firefox 68 ESR
+   * Bug 21549: Enable WASM on standard security level
+   * Bug 28709: Enable FuzzyFox
+ * Windows + OS X + Linux
+   * Update Tor Launcher to 0.2.20.1
+     * Bug 32154: Custom bridge field only allows one line of input
+     * Bug 32112: Fix bad & escaping in translations
+     * Bug 31286: Update to tor settings related strings
+     * Translations update
+   * Bug 32125: Fix circuit display for bridge without a fingerprint
+   * Bug 32076: Upgrade to goptlib v1.1.0
+   * Bug 32061: Bump snowflake version to b4f4b29a03
+   * Bug 32092: Fix Tor Browser Support link in preferences
+   * Bug 32111: Fixed issue parsing user-provided bridge strings
+   * Bug 31749: Fix security level panel spawning events
+   * Bug 31920: Fix Security Level panel when its toolbar button moves to overflow
+   * Bug 31748+31961: Fix 'Learn More' links in Security Level preferences and panel
+   * Translations update
+ * Android
+   * Bug 32097: Fix conflicts in mobile onboarding while rebasing to 68.2.0esr
+   * Bug 26529: Notify user about possible proxy-bypass before opening external app
+ * Build System
+   * Windows
+     * Bug 32132: Re-enable jemalloc for Windows users
+     * Bug 31989: Backport backout of old mingw-gcc patch
+   * Android
+     * Bug 30461: Clean up tor-android-service project
+
 Tor Browser 9.0a8 -- October 14 2019
  * All Platforms
    * Bug 13543: Spoof smooth and powerEfficient for Media Capabilities
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index 3171be7..c4010e7 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.19.5
+version: 0.2.20.1
 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 3ba38e4..45a5c64 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.0a8'
-  torbrowser_build: 'build2'
+  torbrowser_version: '9.5a1'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.0a7
+    - 9.0a8
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1