[tbb-commits] [tor-browser-build/maint-8.5] Prepare 8.5.4 build2

[gk at torproject.org]

commit a553430d13d73b93cc81ce080d0fa3adafc1b02d
Author: Georg Koppen <gk at torproject.org>
Date:   Thu Jul 4 06:34:14 2019 +0000

    Prepare 8.5.4 build2
    
    Pick up new Mozilla signing key and updated translations
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 2 +-
 projects/torbutton/config                           | 2 +-
 rbm.conf                                            | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index ce43836..195bed3 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") %]-1-build1'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2'
 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 1438da2..682b309 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,7 +1,7 @@
 Tor Browser 8.5.4 -- July 9 2019
  * All platforms
    * Update Firefox to 60.8.0esr
-   * Update Torbutton to 2.1.11
+   * Update Torbutton to 2.1.12
      * Bug 30577: Add Fundraising Banner
      * Bug 31041: Stop syncing network.cookie.lifetimePolicy
      * Translations update
diff --git a/projects/torbutton/config b/projects/torbutton/config
index a0df00a..af17cd5 100644
--- a/projects/torbutton/config
+++ b/projects/torbutton/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2.1.11
+version: 2.1.12
 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 2271cef..831f918 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '8.5.4'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 8.5.3
   project_name: tor-browser