commit 5e2f80c31ce5a7a23ffd276c1980f6b3811c2a21 Author: Georg Koppen gk@torproject.org Date: Fri Mar 22 10:29:20 2019 +0000

Release preparations for 8.5a10

Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 4 ++-- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 6 ++++++ rbm.conf | 5 +++-- 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 17a707a..34d6fad 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 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

targets: diff --git a/projects/firefox/config b/projects/firefox/config index 9c85fcb..679aaee 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") %]-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 git_submodule: 1 gpg_keyring: torbutton.gpg

var: - firefox_platform_version: 60.6.0 + firefox_platform_version: 60.6.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 8.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 2dcb72b..177307c 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,9 @@ +Tor Browser 8.5a10 -- March 24 2019 + * All platforms + * Update Firefox to 60.6.1esr + * Update NoScript to 10.2.4 + * Bug 29733: Work around Mozilla's bug 1532530 + Tor Browser 8.5a9 -- March 20 2019 * All platforms * Update Firefox to 60.6.0esr diff --git a/rbm.conf b/rbm.conf index 8e3f54b..32b1f37 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,10 +24,11 @@ buildconf: git_signtag_opt: '-s'

var: - torbrowser_version: '8.5a9' - torbrowser_build: 'build3' + torbrowser_version: '8.5a10' + torbrowser_build: 'build1' torbrowser_incremental_from: - 8.5a8 + - 8.5a9 project_name: tor-browser multi_lingual: 0 build_mar: 1