commit 598392ad1d3a3307b5e266c8d31dc88aa36386b4 Author: Georg Koppen gk@torproject.org Date: Wed Jul 3 10:30:08 2019 +0000

Release preparations for 8.5.4

Changelog update and versions bump --- projects/firefox/config | 4 ++-- projects/https-everywhere/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 18 ++++++++++++++++++ projects/torbutton/config | 2 +- rbm.conf | 7 +++---- 5 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config index be222a5..ce43836 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,14 +1,14 @@ # 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-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 git_submodule: 1 gpg_keyring: torbutton.gpg

var: - firefox_platform_version: 60.7.0 + firefox_platform_version: 60.8.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.5 torbrowser_update_channel: alpha diff --git a/projects/https-everywhere/config b/projects/https-everywhere/config index 2db9177..6232669 100644 --- a/projects/https-everywhere/config +++ b/projects/https-everywhere/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2019.5.13 +version: 2019.6.27 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 8763d44..1438da2 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,21 @@ +Tor Browser 8.5.4 -- July 9 2019 + * All platforms + * Update Firefox to 60.8.0esr + * Update Torbutton to 2.1.11 + * Bug 30577: Add Fundraising Banner + * Bug 31041: Stop syncing network.cookie.lifetimePolicy + * Translations update + * Update HTTPS Everywhere to 2019.6.27 + * Bug 31055+31058: Remove four default bridges + * Bug 30712: Backport fix for Mozilla's bug 1552993 + * Bug 30849: Backport fixes for Mozilla's bug 1552627 and 1549833 + * Windows + OS X + Linux + * Update Tor to 0.4.0.5 + * Update OpenSSL to 1.0.2s + * Bug 29045: Ensure that tor does not start up in dormant mode + * OS X + * Bug 30631: Blurry Tor Browser icon on macOS app switcher + Tor Browser 8.5.3 -- June 21 2019 * All platforms * Pick up fix for Mozilla's bug 1560192 diff --git a/projects/torbutton/config b/projects/torbutton/config index 43705ae..a0df00a 100644 --- a/projects/torbutton/config +++ b/projects/torbutton/config @@ -1,5 +1,5 @@ # vim: filetype=yaml sw=2 -version: 2.1.10 +version: 2.1.11 git_url: https://git.torproject.org/torbutton.git git_hash: '[% c("version") %]' gpg_keyring: torbutton.gpg diff --git a/rbm.conf b/rbm.conf index 060686b..2271cef 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,10 @@ buildconf: git_signtag_opt: '-s'

var: - torbrowser_version: '8.5.3' - torbrowser_build: 'build2' + torbrowser_version: '8.5.4' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 8.5.1 - - 8.5.2 + - 8.5.3 project_name: tor-browser multi_lingual: 0 build_mar: 1