[tbb-commits] [tor-browser-build/master] Prepare build3

[gk at torproject.org]

commit e8c4d33d024cf1f3a3b0f560541f5424e563ca69
Author: Georg Koppen <gk at torproject.org>
Date:   Sun Jun 24 21:18:26 2018 +0000

    Prepare build3
    
    We pick up fix for Windows bustage and a macOS reproducibility issue.
    Moreover an update Torbutton version with a new icon gets included, too.
---
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 5 ++++-
 projects/torbutton/config                           | 2 +-
 rbm.conf                                            | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 1ceda50..5f52bbe 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -4,8 +4,9 @@ Tor Browser 8.0a9 -- June 27 2018
    * Update Tor to 0.3.4.2-alpha
    * Update Libevent to 2.1.8
    * Update Binutils to 2.26.1
-   * Update Torbutton to 2.0
+   * Update Torbutton to 2.0.1
      * Bug 26100: Adapt Torbutton to Firefox 60 ESR
+     * Bug 26430: New Torbutton icon
      * Bug 24309: Move circuit display to the identity popup
      * Bug 26128: Adapt security slider to the WebExtensions version of NoScript
      * Bug 23247: Show security state of .onions
@@ -70,6 +71,7 @@ Tor Browser 8.0a9 -- June 27 2018
     * Bug 23561: Fix nsis builds for Windows 64
     * Bug 23231: Remove our STL Wrappers workaround for Windows 64bit
     * Bug 26370: Don't copy msvcr100.dll and libssp-0.dll twice
+    * Bug 26476: Work around Tor Browser crashes due to fix for bug 1467041
     * Bug 18287: Use SHA-2 signature for Tor Browser setup executables
   * OS X
     * Bug 24632: Update macOS toolchain for ESR 60
@@ -78,6 +80,7 @@ Tor Browser 8.0a9 -- June 27 2018
     * Bug 26003: Clean up our mozconfig-osx-x86_64 file
     * Bug 26195: Use new cctools in our macosx-toolchain project
     * Bug 25975: Get a rust cross-compiler for macOS
+    * Bug 26475: Disable Stylo to make macOS build reproducible
   * Linux
     * Bug 26073: Patch tor-browser-build for transition to ESR 60
     * Bug 25540: Stop building and distributing sandboxed tor browser
diff --git a/projects/torbutton/config b/projects/torbutton/config
index 0791953..ba53944 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.0
+version: 2.0.1
 git_url: https://git.torproject.org/torbutton.git
 git_hash: '[% c("version") %]'
 gpg_keyring: torbutton.gpg
diff --git a/rbm.conf b/rbm.conf
index 67ac46d..31aae9e 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.0a9'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
     - 8.0a8
   project_name: tor-browser