[tor-commits] [tor-browser-build/maint-9.5] Release prep for 9.5.5

[sysrqb at torproject.org]

commit c684b01184c8bb0623411ce3e442daa45769273b
Author: Matthew Finkel <sysrqb at torproject.org>
Date:   Wed Oct 21 13:52:42 2020 +0000

    Release prep for 9.5.5
    
    Changelog update and versions bump
---
 projects/firefox/config                             | 2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++
 rbm.conf                                            | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config
index 5ef60e0..7e5f4f6 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 6186d71..10e7111 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,7 @@
+Tor Browser 9.5.5 -- October 21 2020
+ * Android
+   * Bug 40202: Backport Mozilla Bug 1672223
+
 Tor Browser 9.5.4 -- August 25 2020
  * All Platforms
    * Update Firefox to 68.12.0esr
diff --git a/rbm.conf b/rbm.conf
index 9f6d6d3..f1682ef 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -24,7 +24,7 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '9.5.4'
+  torbrowser_version: '9.5.5'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
     - 9.5.3