[tbb-commits] [tor-browser-build/maint-10.5] Pick up the VPN survey banner for build2

[sysrqb at torproject.org]

commit 7065ef4fd47cb5bbb8662b82d43a9d50fa3d4d72
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Sep 30 20:06:26 2021 +0000

    Pick up the VPN survey banner for build2
---
 projects/fenix/config                               | 2 +-
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++
 rbm.conf                                            | 2 +-
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/projects/fenix/config b/projects/fenix/config
index 7fc455d..72bb3c3 100644
--- a/projects/fenix/config
+++ b/projects/fenix/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 filename: 'fenix-[% c("version") %]-[% c("var/build_id") %].tar.gz'
-git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build1'
+git_hash: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-2-build2'
 git_url: https://gitlab.torproject.org/tpo/applications/fenix.git
 tag_gpg_id: 1
 gpg_keyring: torbutton.gpg
diff --git a/projects/firefox/config b/projects/firefox/config
index 169da33..904ca01 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 6fcda75..fdbbe18 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,6 +1,12 @@
 Tor Browser 10.5.8 -- October 5 2021
  * Windows + OS X + Linux
    * Update Firefox to 78.15.0esr
+   * Bug 40049: Add banner for VPN survey to about:tor [torbutton]
+ * Android
+   * Bug 40193: Add banner for VPN survey to Android homepage [fenix]
+ * Build System
+   * All Platforms
+     * Bug 40363: Change bsaes git url [tor-browser-build]
 
 Tor Browser 10.5.7 -- September 24 2021
  * Android
diff --git a/rbm.conf b/rbm.conf
index a72b586..2e90a29 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -58,7 +58,7 @@ buildconf:
 
 var:
   torbrowser_version: '10.5.8'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 10.5.6
   project_name: tor-browser