[tbb-commits] [tor-browser-build/maint-9.0] Changelog update and build2

[sysrqb at torproject.org]

commit b334967863adbacfb05ebddc3933da6edcbb51c0
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Thu Feb 6 16:59:48 2020 +0000

    Changelog update and build2
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 3 +++
 rbm.conf                                            | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index ccb9ec8..87010ee 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 9ad5b4f..c576cdf 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -9,6 +9,9 @@ Tor Browser 9.0.5 -- February 11 2020
    * Bump Tor to 0.4.2.6
  * Windows
    * Bug 32132: Re-enable jemalloc for Windows users
+ * Build System
+   * All Platforms
+     * Bug 32739: Bump clang to 8.0.1
 
 Tor Browser 9.0.4 -- January 9 2020
  * All Platforms
diff --git a/rbm.conf b/rbm.conf
index c394689..5e43719 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '9.0.5'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 9.0.4
   project_name: tor-browser