commit 984269e721b7dd8e1a5a16d7e4572e049f910fa2 Author: Matthew Finkel sysrqb@torproject.org Date: Fri Jul 2 17:45:24 2021 +0000

Move to 11.0 series --- projects/android-components/config | 2 +- projects/fenix/config | 2 +- projects/firefox/config | 2 +- projects/geckoview/config | 2 +- rbm.conf | 6 +++--- 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config index 060a927..e2f240d 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -9,7 +9,7 @@ variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'

var: android_components_version: 90.0.11 - torbrowser_branch: 10.5 + torbrowser_branch: 11.0 container: use_container: 1 # This should be updated when the list of gradle dependencies is changed. diff --git a/projects/fenix/config b/projects/fenix/config index 48b4e7b..851643d 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -9,7 +9,7 @@ variant: Beta

var: fenix_version: 90.0.0b6 - torbrowser_branch: 10.5 + torbrowser_branch: 11.0 git_branch: 'tor-browser-[% c("var/fenix_version") %]-[% c("var/torbrowser_branch") %]-1' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' container: diff --git a/projects/firefox/config b/projects/firefox/config index e8884e6..78fb570 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -10,7 +10,7 @@ gpg_keyring: torbutton.gpg var: firefox_platform_version: 78.11.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - torbrowser_branch: 10.5 + torbrowser_branch: 11.0 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/geckoview/config b/projects/geckoview/config index f3abddb..750ad84 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -9,7 +9,7 @@ gpg_keyring: torbutton.gpg

var: geckoview_version: 90.0b12 - torbrowser_branch: 10.5 + torbrowser_branch: 11.0 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: - build-essential diff --git a/rbm.conf b/rbm.conf index b9ec6e5..6388d5c 100644 --- a/rbm.conf +++ b/rbm.conf @@ -57,10 +57,10 @@ buildconf: git_signtag_opt: '-s'

var: - torbrowser_version: '10.5a17' - torbrowser_build: 'build2' + torbrowser_version: '11.0a1' + torbrowser_build: 'build1' torbrowser_incremental_from: - - 10.5a16 + - 10.5a17 project_name: tor-browser multi_lingual: 0 build_mar: 1