[tbb-commits] [tor-browser-build/master] Pick up changes for build5

[gk at torproject.org]

commit cc4d8a1a74c1def3c0921e59763d09864d72bc77
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Nov 7 10:27:20 2019 +0000

    Pick up changes for build5
---
 projects/firefox/config                             |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 13 +++++++++++--
 rbm.conf                                            |  2 +-
 3 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 1af3014..8c26eb9 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-build3'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build4'
 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 6240fdc..f8caf37 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,6 +1,6 @@
-Tor Browser 9.5a2 -- November 6 2019
+Tor Browser 9.5a2 -- November 8 2019
  * All Platforms
-   * Update NoScript to 11.0.4
+   * Update NoScript to 11.0.7
      * 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
@@ -21,8 +21,17 @@ Tor Browser 9.5a2 -- November 6 2019
    * 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
+   * Bug 32220: Improve the letterboxing experience
+   * Bug 30683: Backport upstreamed fix from Mozilla (bug 1581537)
  * Android
    * Bug 32342: Crash when changing the browser locale
+   * Bug 32303: Obfs4 is broken on Android Q
+ * Build System
+   * All Platforms
+     * Bug 32413: Bump Go version to 1.12.13
+     * Bug 32053: Compile Rust code with -O1 to avoid reproducibility issues
+   * Android
+     * Bug 28803: Integrate building Pluggable Transports for Android
 
 Tor Browser 9.5a1 -- October 23 2019
  * All Platforms
diff --git a/rbm.conf b/rbm.conf
index aaa6e3a..c6da42c 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '9.5a2'
-  torbrowser_build: 'build4'
+  torbrowser_build: 'build5'
   torbrowser_incremental_from:
     - 9.5a1
   project_name: tor-browser