commit 599384e472b551f91bb38e3956dc8858fa2d43f4 Author: Georg Koppen gk@torproject.org Date: Sun Oct 20 08:23:37 2019 +0000

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

diff --git a/projects/firefox/config b/projects/firefox/config index c30a71f..de83467 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-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 git_submodule: 1 diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 4d52fd2..10f3682 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -5,7 +5,6 @@ Tor Browser 9.5a1 -- October 23 2019 * Bug 30681: Set security.enterprise_roots.enabled to false * Bug 31144: Review network code changes for Firefox 68 ESR * Bug 21549: Enable WASM on standard security level - * Bug 28709: Enable FuzzyFox * Windows + OS X + Linux * Update Tor Launcher to 0.2.20.1 * Bug 32154: Custom bridge field only allows one line of input diff --git a/rbm.conf b/rbm.conf index 45a5c64..6fe1010 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf:

var: torbrowser_version: '9.5a1' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.0a8 project_name: tor-browser