commit 7e5fa15b70f08bda97a7d00d4cd4fe36cf651845 Author: Georg Koppen gk@torproject.org Date: Tue Jun 18 05:15:16 2019 +0000

Release prep for 8.5.2 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 7 +++++++ rbm.conf | 4 ++-- 3 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config index 8547aca..e95ccbd 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-build2' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-build1' 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 1469988..317bb1f 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,10 @@ +Tor Browser 8.5.2 -- June 19 2019 + * All platforms + * Pick up fix for Mozilla's bug 1544386 + * Update NoScript to 10.6.3 + * Bug 29904: NoScript blocks MP4 on higher security levels + * Bug 30624+29043+29647: Prevent XSS protection from freezing the browser + Tor Browser 8.5.1 -- June 4 2019 * All platforms * Update Torbutton to 2.1.10 diff --git a/rbm.conf b/rbm.conf index ee9e322..651bf98 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,10 @@ buildconf: git_signtag_opt: '-s'

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