[tor-commits] [tor-browser-build/maint-7.5] Release preparations for 7.5.5

[gk at torproject.org]

commit d0e565d00e236e331f8ebf040b4225b6875d471f
Author: Georg Koppen <gk at torproject.org>
Date:   Fri Jun 8 21:25:47 2018 +0000

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

diff --git a/projects/firefox/config b/projects/firefox/config
index 886cfdc..e91d1ca 100644
--- a/projects/firefox/config
+++ b/projects/firefox/config
@@ -1,13 +1,13 @@
 # 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-build2'
+git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1'
 tag_gpg_id: 1
 git_url: https://git.torproject.org/tor-browser.git
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 52.8.0
+  firefox_platform_version: 52.8.1
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 7.5
   torbrowser_update_channel: alpha
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index 7f5a736..5d52b10 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,8 @@
+Tor Browser 7.5.5 -- June 10 2018
+ * All platforms
+   * Update Firefox to 52.8.1esr
+   * Bug 26098: Remove amazon-meek
+
 Tor Browser 7.5.4 -- May 9 2018
  * All platforms
    * Update Firefox to 52.8.0esr
diff --git a/rbm.conf b/rbm.conf
index ca427f9..4329958 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,10 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '7.5.4'
+  torbrowser_version: '7.5.5'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 7.5.3
+    - 7.5.4
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1