[tbb-commits] [tor-browser-build/85a12_30388] Picking up better tor browser fixes and newer Torbutton for build3

[gk at torproject.org]

commit a28a0c3b1b52a1ef87cb58bd6b62d888fcf313a0
Author: Georg Koppen <gk at torproject.org>
Date:   Mon May 6 20:52:08 2019 +0000

    Picking up better tor browser fixes and newer Torbutton for build3
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 8 +++++---
 projects/torbutton/config                           | 2 +-
 rbm.conf                                            | 2 +-
 4 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index d743187..b09db55 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") %]-2-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build3'
 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 425e1b6..7041504 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,7 +1,9 @@
 Tor Browser 8.5a12 -- May 7 2019
-* All platforms
-  * Backport fixes for bug 1549010 and bug 1549061
-    * Bug 30388: NoScript and all user-installed add-ons got deactivated
+ * All platforms
+   * Update Torbutton to 2.1.7
+     * Bug 30388: Make sure the updated intermediate certificate keeps working
+   * Backport fixes for bug 1549010 and bug 1549061
+     * Bug 30388: Make sure the updated intermediate certificate keeps working
 
 Tor Browser 8.5a11 -- April 16 2019
  * All platforms
diff --git a/projects/torbutton/config b/projects/torbutton/config
index 5f3bbce..24fe822 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.1.6
+version: 2.1.7
 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 7008e5c..54b1f7f 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.5a12'
-  torbrowser_build: 'build2'
+  torbrowser_build: 'build3'
   torbrowser_incremental_from:
     - 8.5a11
   project_name: tor-browser