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

[gk at torproject.org]

commit ad2095ad97cdb3b27f800561529578f3bac511f7
Author: Georg Koppen <gk at torproject.org>
Date:   Wed May 2 07:52:50 2018 +0000

    Release preparations for 7.5.4
    
    Changelog update and versions bump
---
 projects/firefox-langpacks/config                   |  2 +-
 projects/firefox/config                             |  6 +++---
 projects/https-everywhere/config                    |  2 +-
 projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 11 +++++++++++
 rbm.conf                                            |  5 ++---
 5 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config
index 04cd7dd..4e42939 100644
--- a/projects/firefox-langpacks/config
+++ b/projects/firefox-langpacks/config
@@ -4,7 +4,7 @@ filename: '[% project %]-[% c("version") %]-[% c("var/osname") %]-[% c("var/buil
 
 var:
   ff_version: '[% pc("firefox", "var/firefox_version") %]'
-  ff_build: build2
+  ff_build: build1
   ff_arch: linux-i686
   input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'
 
diff --git a/projects/firefox/config b/projects/firefox/config
index 22c7a0b..886cfdc 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-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
 gpg_keyring: torbutton.gpg
 
 var:
-  firefox_platform_version: 52.7.3
+  firefox_platform_version: 52.8.0
   firefox_version: '[% c("var/firefox_platform_version") %]esr'
   torbrowser_branch: 7.5
   torbrowser_update_channel: alpha
@@ -28,7 +28,7 @@ targets:
       torbrowser_update_channel: release
 
   nightly:
-    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2'
+    git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1'
     tag_gpg_id: 0
     var:
       torbrowser_update_channel: default
diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config
index 38eb2be..cfa0a78 100644
--- a/projects/https-everywhere/config
+++ b/projects/https-everywhere/config
@@ -1,5 +1,5 @@
 # vim: filetype=yaml sw=2
-version: 2018.3.13
+version: 2018.4.11
 git_url: https://git.torproject.org/https-everywhere.git
 git_hash: '[% c("version") %]'
 git_submodule: 1
diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
index f9a328a..7f5a736 100644
--- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
+++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt
@@ -1,3 +1,14 @@
+Tor Browser 7.5.4 -- May 9 2018
+ * All platforms
+   * Update Firefox to 52.8.0esr
+   * Update HTTPS Everywhere to 2018.4.11
+   * Update NoScript to 5.1.8.5
+   * Bug 23439: Exempt .onion domains from mixed content warnings
+   * Bug 22614: Make e10s/non-e10s Tor Browsers indistinguishable
+   * Bug 22659: Changes to `intl.accept.languages` get overwritten after restart
+   * Bug 25973: Backport off-by-one fix (bug 1352073)
+   * Bug 25020: Add a tbb_version.json file
+
 Tor Browser 7.5.3 -- March 26 2018
  * All platforms
    * Update Firefox to 52.7.3esr
diff --git a/rbm.conf b/rbm.conf
index 1f7d0d4..ca427f9 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -15,11 +15,10 @@ buildconf:
   git_signtag_opt: '-s'
 
 var:
-  torbrowser_version: '7.5.3'
+  torbrowser_version: '7.5.4'
   torbrowser_build: 'build1'
   torbrowser_incremental_from:
-    - 7.5.1
-    - 7.5.2
+    - 7.5.3
   project_name: tor-browser
   multi_lingual: 0
   build_mar: 1