Skip to content

Draft: 40236: Rebase tor-browser patches to 84.0b1

Closes #40236 (closed).

Rebased FIREFOX_83_0_RELEASE..tor-browser-83.0-10.5-1-build1(00da5c13) onto FIREFOX_84_0b1_RELEASE (9e429e39)

There were many conflicts due to python style changes in

I adapted our patches style with ./mach lint --linter black --fix.

c2ea6b48a7068... TB3: Tor Browser's official .mozconfigs
	both modified:   browser/base/
	both modified:   browser/moz.configure
	both modified:   build/moz.configure/android-sdk.configure
	both modified:   build/moz.configure/old.configure
	both modified:   mobile/android/moz.configure
	both modified:   security/
	both modified:   toolkit/modules/AppConstants.jsm
	both modified:   toolkit/modules/

1450046deb3dd... TB4: Tor Browser's Firefox preference overrides
	both modified:   browser/
	both modified:   mobile/android/app/

f9b0db07f5aaf... Bug 28044: Integrate Tor Launcher into tor-browser
	both modified:   browser/extensions/

723958367aaa9... Bug 10760: Integrate TorButton to TorBrowser core
	both modified:   toolkit/

5ba483200818a... Add TorStrings module for localization
	both modified:   browser/modules/

8e632890ec9eb... Bug 16439: Remove screencasting code
	both modified:   toolkit/modules/

e5ea2caab22c0... Bug 13252: Do not store data in the app bundle
	both modified:   xpcom/io/

7952e5387b7e3... Bug 2176: Rebrand Firefox to TorBrowser
	both modified:   browser/branding/nightly/locales/

923f2be4475b4... Bug 18821: Disable libmdns for Android and Desktop
	both modified:   dom/presentation/provider/
	both modified:   netwerk/dns/mdns/libmdns/

e1f3764763b4e... Bug 19273: Avoid JavaScript patching of the external app helper dialog.
	both modified:   uriloader/exthandler/nsExternalHelperAppService.cpp

ea22fbe362972... Bug 4234: Use the Firefox Update Process for Tor Browser.
	both modified:   build/moz.configure/init.configure
	both modified:   config/
	both modified:   toolkit/mozapps/update/
	both modified:   toolkit/mozapps/update/updater/

319fe512d871a... Bug 13379: Sign our MAR files.
	both modified:   modules/libmar/tool/
	both modified:   modules/libmar/verify/
	both modified:   toolkit/mozapps/update/updater/

c5fef0b9a5bae... Bug 16940: After update, load local change notes.
	both modified:   browser/components/

f027b014cee13... Bug 21431: Clean-up system extensions shipped in Firefox
	both modified:   browser/extensions/

f33f44c1b7df1... Bug 25658: Replace security slider with security level UI

1f268a7488af6... Bug 28369: Stop shipping pingsender executable
	both modified:   python/mozbuild/mozbuild/
	both modified:   toolkit/components/telemetry/

fd485069fdabd... Bug 23247: Communicating security expectations for .onion
	both modified:   browser/base/content/pageinfo/security.js
	both modified:   dom/ipc/WindowGlobalActor.cpp

17d133a462ff1... Bug 26345: Hide tracking protection UI
	both modified:   browser/components/

9df83c26cf345... Bug 31575: Replace Firefox Home (newtab) with about:tor
	both modified:   browser/components/BrowserGlue.jsm
		TODO: check new ASRouter actor!

609e6afac995a... Bring back old Firefox onboarding
	both modified:   browser/components/BrowserGlue.jsm
	both modified:   browser/extensions/
	both modified:   browser/locales/
		I had to fix this patch: I did not check which Firefox change caused it, but it was complaining of
		`Services` not being found in the `onboarding.js` frame script.
		After this I also had to change the `` to not load it
		in the global scope, since there were issues with other frame scripts complaining of `Services`
		already being defined. With this, the onboarding seems to work fine.

926b8ca167b30... Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#tor
	both modified:   browser/components/
	both modified:   browser/modules/

a35c40c489936... Bug 31740: Remove some unnecessary RemoteSettings instances
	both modified:   services/settings/dumps/blocklists/
	both modified:   services/settings/dumps/main/
	both modified:   services/settings/dumps/security-state/

a3f95804082d4... Bug 30237: Add v3 onion services client authentication prompt
	both modified:   browser/components/
	both modified:   dom/ipc/PBrowser.ipdl

cc79a000fdbe5... Bug 33342: Avoid disconnect search addon error after removal.
	both modified:   toolkit/mozapps/extensions/internal/XPIProvider.jsm

112d3dcea13d7... Bug 28005: Implement .onion alias urlbar rewrites
	both modified:   browser/components/BrowserGlue.jsm

598cd0778e9db... Bug 32418: Allow updates to be disabled via an enterprise policy.
	both modified:   toolkit/components/enterprisepolicies/

f88c00eb9e689... Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc.
	both modified:   browser/components/aboutlogins/content/aboutLogins.js
	both modified:   browser/components/aboutlogins/content/components/menu-button.css
Edited by Alex Catarineu

Merge request reports