[tor-commits] [tor-browser-build/master] Preparing -build2 for 9.0a2

[gk at torproject.org]

commit d151c053c01eef50f5b304680b61169684ae2c09
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 7 08:22:45 2019 +0000

    Preparing -build2 for 9.0a2
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++--
 projects/tor/config                                 | 2 +-
 rbm.conf                                            | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index c0aad72..bb83d9c 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 9.0a2 -- June 7 2019
+Tor Browser 9.0a2 -- June 11 2019
  * All platforms
    * Update Torbutton to 2.2
      * Bug 30565: Sync nocertdb with privatebrowsing.autostart at startup
@@ -11,7 +11,7 @@ Tor Browser 9.0a2 -- June 7 2019
    * Bug 30712: Backport fix for Mozilla's bug 1552993
    * Bug 30469: Add locale ro
  * Windows + OS X + Linux
-   * Update Tor to 0.4.1.1-alpha
+   * Update Tor to 0.4.1.2-alpha
    * Update OpenSSL to 1.1.1c
    * Update Tor Launcher to 0.2.19.1
      * Bug 30469: Add locale ro
@@ -30,6 +30,8 @@ Tor Browser 9.0a2 -- June 7 2019
      * Bug 30536: Update Go to 1.12.5
    * OS X
      * Bug 30491: Move our macOS builds to Debian Stretch
+   * Linux
+     * Bug 25930: Update GCC to 8.3.0 for our Linux builds
 
 Tor Browser 9.0a1 -- May 21 2019
  * All platforms
diff --git a/projects/tor/config b/projects/tor/config
index 8b02b6c..6f4b5f2 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.1.1-alpha
+version: 0.4.1.2-alpha
 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 a7c32a8..6f121c2 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '9.0a2'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 9.0a1
   project_name: tor-browser