[tbb-commits] [tor-browser-build/master] Change Firefox version and tag build2

[sysrqb at torproject.org]

commit 3fb287a4669f623fae41d40de9e0552f1e40b0bc
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Tue May 19 19:58:42 2020 +0000

    Change Firefox version and tag build2
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 1 -
 rbm.conf                                            | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 5618abb..b6a8440 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") %]-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 168a021..aadb432 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,6 +1,5 @@
 Tor Browser 9.5a13 -- May 20 2020
  * All Platforms
-   * Update Firefox to 68.8.1esr
    * Bump NoScript to 11.0.26
    * Bump Tor to 0.4.3.5
    * Translations update
diff --git a/rbm.conf b/rbm.conf
index 131845c..628e33d 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -25,7 +25,7 @@ buildconf:
 
 var:
   torbrowser_version: '9.5a13'
-  torbrowser_build: 'build1'
+  torbrowser_build: 'build2'
   torbrowser_incremental_from:
     - 9.5a12
   project_name: tor-browser