[tbb-commits] [tor-browser-build/master] Picking up two bug fixes for -build3

[gk at torproject.org]

commit 421504a765f601ba4647d948a08aebf592b33614
Author: Georg Koppen <gk at torproject.org>
Date:   Tue Mar 19 13:14:05 2019 +0000

    Picking up two bug fixes for -build3
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 +++--
 rbm.conf                                            | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 1054827..90a1617 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,4 +1,4 @@
-Tor Browser 8.5a9 -- March 19 2019
+Tor Browser 8.5a9 -- March 20 2019
  * All platforms
    * Update Firefox to 60.6.0esr
    * Update Torbutton to 2.1.5
@@ -32,6 +32,7 @@ Tor Browser 8.5a9 -- March 19 2019
    * Bug 28802: Support PTs in Tor Browser for Android
    * Bug 29794: Update TBA built-in bridges
    * Bug 27210: Add support for x86 on Android
+   * Bug 29809: Only ship tor binary for .apk architecture
    * Bug 29633: Don't ship pdnsd anymore
    * Bug 28708: about:tor is not the default homepage after upgrade
    * Bug 29626: Application name is now "Always-On Notifications"
@@ -42,7 +43,7 @@ Tor Browser 8.5a9 -- March 19 2019
      * Bug 28685: Set Build ID based on Tor Browser version
      * Bug 29194: Set DEBIAN_FRONTEND=noninteractive
    * Linux
-     * Bug 26323: Build 32bit Linux bundles on 64bit Debian Wheezy
+     * Bug 26323+29812: Build 32bit Linux bundles on 64bit Debian Wheezy
      * Bug 29758: Build firefox debug symbols for linux-i686
    * Android
      * Bug 29632: Use HTTPS for downloading Gradle
diff --git a/rbm.conf b/rbm.conf
index ce4b260..8e3f54b 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.5a9'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
     - 8.5a8
   project_name: tor-browser