commit 1dd79281f904bfce4a9c5d4dfeb998367dc0b853 Author: Matthew Finkel sysrqb@torproject.org Date: Fri Feb 5 16:55:12 2021 +0000

Release preparation for 10.0.11

Versions bump and Changelog update --- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 6 +++--- projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt | 4 ++++ rbm.conf | 4 ++-- 4 files changed, 10 insertions(+), 6 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 1ffe7b0..4aa0f72 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") %]-2-build1' +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: 78.7.0 + firefox_platform_version: 78.7.1 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.0 branding_directory: 'browser/branding/alpha' @@ -49,7 +49,7 @@ targets: branding_directory: 'browser/branding/official'

nightly: - git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-2' + git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1' tag_gpg_id: 0 var: branding_directory: 'browser/branding/nightly' diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7714bfc..3342c5e 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -1,3 +1,7 @@ +Tor Browser 10.0.11 -- February 6 2021 + * Windows + * Update Firefox to 78.7.1esr + Tor Browser 10.0.10 -- February 3 2021 * Windows + OS X + Linux * Update NoScript to 11.2 diff --git a/rbm.conf b/rbm.conf index ba9a51e..368fa3a 100644 --- a/rbm.conf +++ b/rbm.conf @@ -24,11 +24,11 @@ buildconf: git_signtag_opt: '-s'

var: - torbrowser_version: '10.0.10' + torbrowser_version: '10.0.11' torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.0.8 - 10.0.9 + - 10.0.10 project_name: tor-browser multi_lingual: 0 build_mar: 1