[tbb-commits] [tor-browser-build/maint-8.0] Prepare -build2 for 8.0.7

[gk at torproject.org]

commit 8487e3a1e498dcb5604d884d422ab999957877f8
Author: Georg Koppen <gk at torproject.org>
Date:   Wed Mar 13 12:47:08 2019 +0000

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

diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 6a941a1..4d533ce 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -3,6 +3,10 @@ Tor Browser 8.0.7 -- March 19 2019
    * Update Firefox to 60.6.0esr
    * Update Tor to 0.3.5.8
      * Bug 29660: XMPP can not connect to SOCKS5 anymore
+   * Update Torbutton to 2.0.11
+     * Bug 29021: Tell NoScript it is running within Tor Browser
+ * Windows
+   * Bug 29081: Harden libwinpthread
  * Linux
    * Bug 27531: Add separate LD_LIBRARY_PATH for fteproxy
 
diff --git a/projects/torbutton/config b/projects/torbutton/config
index c262950..0d66ae0 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.0.10
+version: 2.0.11
 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 49166f2..3de1879 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -16,7 +16,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.0.7'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 8.0.6
   project_name: tor-browser