commit 333e407b61f711955b5a797f1582f6dd9b3fedfe Author: Matthew Finkel sysrqb@torproject.org Date: Fri Nov 13 17:31:53 2020 +0000

Revert "Fold in stable 10.0.4 changelog"

This reverts commit f81fca9a79f99c648821ae1829c6333f4ff25d65. --- projects/android-components/config | 2 +- projects/fenix/config | 2 +- projects/firefox-langpacks/config | 2 +- projects/firefox/config | 2 +- projects/geckoview/config | 2 +- .../tor-browser/Bundle-Data/Docs/ChangeLog.txt | 24 ---------------------- rbm | 2 +- 7 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/projects/android-components/config b/projects/android-components/config index b59dcdb..e8dc2ab 100644 --- a/projects/android-components/config +++ b/projects/android-components/config @@ -8,7 +8,7 @@ gpg_keyring: torbutton.gpg variant: '[% IF c("var/release") %]Release[% ELSE %]Beta[% END %]'

var: - android_components_version: 63.0.8 + android_components_version: 63.0.1 torbrowser_branch: 10.5 container: use_container: 1 diff --git a/projects/fenix/config b/projects/fenix/config index c026147..c3bb039 100644 --- a/projects/fenix/config +++ b/projects/fenix/config @@ -8,7 +8,7 @@ gpg_keyring: torbutton.gpg variant: Beta

var: - fenix_version: 83.0.0 + fenix_version: 83.0.0b2 torbrowser_branch: 10.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' container: diff --git a/projects/firefox-langpacks/config b/projects/firefox-langpacks/config index 34d6fad..17a707a 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: build1 + ff_build: build2 input_filename: 'dl-langpack-[% c("var/ff_arch") %]-[% c("version") %]'

targets: diff --git a/projects/firefox/config b/projects/firefox/config index b8bc4bd..2daf0c3 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg

var: - firefox_platform_version: 78.5.0 + firefox_platform_version: 78.4.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' torbrowser_branch: 10.5 branding_directory: 'browser/branding/alpha' diff --git a/projects/geckoview/config b/projects/geckoview/config index ebb84a9..e1608ed 100644 --- a/projects/geckoview/config +++ b/projects/geckoview/config @@ -8,7 +8,7 @@ git_submodule: 1 gpg_keyring: torbutton.gpg

var: - geckoview_version: 83.0 + geckoview_version: 83.0b1 torbrowser_branch: 10.5 copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' deps: diff --git a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt index 7fb02a0..095dad9 100644 --- a/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt +++ b/projects/tor-browser/Bundle-Data/Docs/ChangeLog.txt @@ -18,30 +18,6 @@ Tor Browser 10.5a3 -- November 10 2020 * Windows + OS X + Linux * Bug 40133: Bump Rust version for ESR 78 to 1.43.0 [tor-browser-build]

-Tor Browser 10.0.4 -- November 9 2020 - * Android - * Update NoScript to 11.1.5 - * Bug 40022: EOY November Update - Matching [torbutton] - * Bug 40106: EOY November Update - Matching [fenix] - * Bug 40219: Backport Mozilla Bug 1675905 [tor-browser] - * Translations update - * Build System - * Android - * Update Go to 1.14.11 - * Bug 40141: Include "android" in signed tag [tor-browser-build] - -Tor Browser 10.0.4 -- November 9 2020 - * Windows + OS X + Linux - * Update NoScript to 11.1.5 - * Bug 40021: Keep page shown after Tor Browser update purple [torbutton] - * Bug 40022: EOY November Update - Matching [torbutton] - * Bug 40219: Backport Mozilla Bug 1675905 [tor-browser] - * Translations update - * Build System - * Windows + OS X + Linux - * Update Go to 1.14.11 - * Bug 40141: Include "desktop" in signed tag [tor-browser-build] - Tor Browser 10.0.3 -- November 2 2020 * Android * Update Fenix to 82.1.1 diff --git a/rbm b/rbm index a32239d..15c8476 160000 --- a/rbm +++ b/rbm @@ -1 +1 @@ -Subproject commit a32239ddb1f465115cb4a8bb9f4b853c149506f3 +Subproject commit 15c84760ebe3f2677d1212aa00ef6f7485446a69