commit a4244c3f9ec18e3a28cb61b749c709a1de82bb1f Author: Georg Koppen gk@torproject.org Date: Tue Jan 26 09:48:09 2021 +0000

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

diff --git a/projects/geckoview/config b/projects/geckoview/config index 5ebe6c4..475385b 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'geckoview-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' -git_hash: 'tor-browser-[% c("var/geckoview_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/geckoview_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 7228ed7..935c1a6 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -4,6 +4,7 @@ Tor Browser 10.0.9 -- January 26 2021 * Update NoScript to 11.1.9 * Bug 40137: Remove EOY 2020 Campaign [fenix] * Bug 40165: Update zstd to 1.4.8 [tor-browser-build] + * Bug 40308: Disable network state partitioning until audit [tor-browser] * Build System * Android * Bug 40190: Update toolchain for Fenix 85 [tor-browser-build] diff --git a/rbm.conf b/rbm.conf index 9048bf3..8fc7ebd 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf:

var: torbrowser_version: '10.0.9' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 10.5a1 project_name: tor-browser