commit 95bc7fde8230aab8fdb3cc87a1d8143f400c25e4 Author: Georg Koppen gk@torproject.org Date: Thu Nov 7 22:13:05 2019 +0000

Pick up changes for build6 --- projects/firefox/config | 2 +- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++-- rbm.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/projects/firefox/config b/projects/firefox/config index 8c26eb9..3c57c71 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-build4' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build5' 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 f8caf37..dda1936 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,4 +1,4 @@ -Tor Browser 9.5a2 -- November 8 2019 +Tor Browser 9.5a2 -- November 11 2019 * All Platforms * Update NoScript to 11.0.7 * Bug 21004: Don't block JavaScript on onion services on medium security @@ -7,6 +7,7 @@ Tor Browser 9.5a2 -- November 8 2019 * Bug 32321: Don't ping Mozilla for Man-in-the-Middle-detection * Bug 32318: Backport Mozilla's fix for bug 1534339 * Bug 32250: Backport enhanced letterboxing support (bug 1546832 and 1556017) + * Bug 31573: Catch SessionStore.jsm exception * Bug 27268: Preferences clean-up * Windows + OS X + Linux * Update Tor to 0.4.2.3-alpha @@ -29,7 +30,6 @@ Tor Browser 9.5a2 -- November 8 2019 * Build System * All Platforms * Bug 32413: Bump Go version to 1.12.13 - * Bug 32053: Compile Rust code with -O1 to avoid reproducibility issues * Android * Bug 28803: Integrate building Pluggable Transports for Android

diff --git a/rbm.conf b/rbm.conf index c6da42c..4a90ccc 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf:

var: torbrowser_version: '9.5a2' - torbrowser_build: 'build5' + torbrowser_build: 'build6' torbrowser_incremental_from: - 9.5a1 project_name: tor-browser