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

[gk at torproject.org]

commit aec5ee918c493f0a6b7fba168f30ed1be2f90d89
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Nov 1 21:30:19 2019 +0000

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

diff --git a/projects/firefox/config b/projects/firefox/config
index de83467..1af3014 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-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build3'
 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 d44272c..83c170e 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,28 @@
+Tor Browser 9.5a.2 -- November 5 2019
+ * All Platforms
+   * Update NoScript to 11.0.4
+     * Bug 21004: Don't block JavaScript on onion services on medium security
+     * Bug 27307: NoScript marks HTTP onions as not secure
+   * Bug 30783: Fundraising banner for EOY 2019 campain
+   * Bug 32321: Don't ping Mozilla for Man-in-the-Middle-detection
+   * Bug 32318: Backport Mozilla's fix for bug 1534339
+   * Bug 32250: Backport enhanced letterboxing support (bug 1546832 and 1556017)
+   * Bug 27268: Preferences clean-up
+ * Windows + OS X + Linux
+   * Update Tor Launcher to 0.2.20.2
+     * Bug 32164: Trim each received log line from tor
+     * Translations update
+   * Bug 31803: Replaced about:debugging logo with flat version
+   * Bug 31764: Fix for error when navigating via 'Paste and go'
+   * Bug 32169: Fix TB9 Wikipedia address bar search
+   * Bug 32210: Hide the tor pane when using a system tor
+   * Bug 31658: Use builtin --panel-disabled-color for security level text
+   * Bug 32188: Fix localization on about:preferences#tor
+   * Bug 32184: Red dot is shown while downloading an update
+   * Bug 27604: Fix broken Tor Browser after moving it to a different directory
+ * Android
+   * Bug 32342: Crash when changing the browser locale
+
 Tor Browser 9.5a1 -- October 23 2019
  * All Platforms
    * Update Firefox to 68.2.0esr
diff --git a/projects/tor-launcher/config b/projects/tor-launcher/config
index c4010e7..5eef2e2 100644
--- a/projects/tor-launcher/config
+++ b/projects/tor-launcher/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 0.2.20.1
+version: 0.2.20.2
 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 6fe1010..0f2e76f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,10 +24,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5a1'
-  torbrowser_build: 'build2'
+  torbrowser_version: '9.5a2'
+  torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 9.0a8
+    - 9.5a1
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1