Skip to content

Rebase tor-browser onto 143

Merge Info

Issues

Resolves

Merging

Target Branches

  • tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Target Channels

  • Alpha: esr140-15.0
  • Stable: esr128-14.5
  • Legacy: esr115-13.5

Backporting

Timeline

  • No Backport (preferred): patchset for the next major stable
  • Immediate: patchset needed as soon as possible (fixes CVEs, 0-days, etc)
  • Next Minor Stable Release: patchset that needs to be verified in nightly before backport
  • Eventually: patchset that needs to be verified in alpha before backport

(Optional) Justification

  • Security update: patchset contains a security fix (be sure to select the correct item in Timeline)
  • Censorship event: patchset enables censorship circumvention
  • Critical bug-fix: patchset fixes a bug in core-functionality
  • Consistency: patchset which would make development easier if it were in both the alpha and release branches; developer tools, build system changes, etc
  • Sponsor required: patchset required for sponsor
  • Localization: typos and other localization changes that should be also in the release branch
  • Other: please explain

Upstream

  • Patchset is a candidate for uplift to Firefox
  • Patchset is a backport from Firefox
    • Bugzilla link:
    • Upstream commit:

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /request_review all the relevant reviewers
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • ci/cd: brizental, henry
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : jwilde, ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, morgan
    • localization : henry, pierov
    • macOS : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : brizental, clairehurst, dan, ma1, pierov, morgan
    • security : jwilde, ma1
    • signing : boklm, morgan
    • updater : pierov
    • windows : jwilde, morgan
    • misc/other : pierov, morgan

Change Description

  • BB 41459: WebRTC fails to build under mingw (Part 2)
    • rtc:: import is now webrtc::
    • TODO: Run windows build with --enable-webrtc to verify resolutions still build.
  • BB 42730: Patch RemoteSettings to use only local dumps as a data source
    • Conflicts in services/settings/RemoteSettingsClient.sys.mjs due to Bug 1981367
    • Audit ticket: #44154
  • [android] Disable features and functionality
    • A few minor conflicts. One of them in SiteSettingsFragment.kt brought to my attention Bug 1971290.
    • Audit ticket: #44155
    • Bug 1978008 added new imports of AdvertisingIdClient, which I had to remove.
  • TB 34403 [android]: Disable Normal mode by default.
    • Bookmarks code has been moved and deleted: Bug 1955692. I dropped our changes, but we will have to bring them back.
    • Audit ticket: #44156
  • [android] Modify UI/UX
    • Same note on bookmarks and Bug 1955692
  • TB 42191: [android] Temporary StrictMode relaxation to clear the thumbnail cache.
    • Had to modify this patch due to Bug 1977891
    • Audit ticket: #44160
  • BB 31575: Disable Firefox Home (Activity Stream)
  • BB 44045: Disable ML features.
    • As predicted toolkit/components/formautofill/MLAutofill.sys.mjs was removed by Bug 1977600. No audit ticket required, IMO.
    • linkPreviewShift and linkPreviewShiftAlt have been removed by Bug 1954267.
    • Audit ticket:

How Tested

Related to #44151

Edited by brizental

Merge request reports

Loading