commit 5344bfa8cd1d9a194038184158e26a7984d4ae7c Author: Matthew Finkel sysrqb@torproject.org Date: Sat Sep 19 17:29:50 2020 +0000

Pick up tor-browser -build2 and tag build3 --- 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 66b079f..189b02e 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") %]-2-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2-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 6e2e2e7..0700ae9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -23,7 +23,6 @@ Tor Browser 10.0 -- September 22 2020 * Bug 30682: Disable Intermediate CA Preloading * Bug 30812: Exempt about: pages from Resist Fingerprinting * Bug 31918+33533+40024+40037: Rebase Tor Browser esr68 patches for ESR 78 [tor-browser] - * Bug 32017: Use ExtensionStorageIDB again * Bug 32612: Update MAR_CHANNEL_ID for the alpha * Bug 32886: Separate treatment of @media interaction features for desktop and android * Bug 33534: Review FF release notes from FF69 to latest (FF78) diff --git a/rbm.conf b/rbm.conf index ac24f8f..c1332dd 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf:

var: torbrowser_version: '10.0' - torbrowser_build: 'build2' + torbrowser_build: 'build3' torbrowser_incremental_from: - 9.5.4 project_name: tor-browser