MB 421: Rebased release onto 128.10.0esr
Merge Info
Issues
Resolves
- #421 (closed)
- tor-browser#xxxxx
- tor-browser-build#xxxxx
Related
- mullvad-browser#xxxxx
- tor-browser#xxxxx
- tor-browser-build#xxxxx
Merging
Target Branches
-
mullvad-browser-!fixupstomullvad-browser-specific commits, new features, security backports -
base-browserandtor-browser-!fixupstobase-browser-specific commits or new features to be shared withtor-browser-
⚠️ IMPORTANT: Please list thebase-browser-specific commits which need to be cherry-picked to thebase-browserandtor-browserbranches here
-
Target Channels
-
Stable: esr128-14.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) -
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
-
Link resolved issues with appropriate Release Prep issue for changelog generation
Review
Request Reviewer
-
Request review from an applications developer depending on modified system: -
NOTE: if the MR modifies multiple areas, please
/ccall the relevant reviewers (since Gitlab only allows 1 reviewer) - 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
-
NOTE: if the MR modifies multiple areas, please
Change Description
Usual rebases.
I removed the old MB 188 commit, and kept only the new fixup.
How Tested
Diff of diffs is slightly off.
I think we forgot to cherry-pick a few commits, namely a BB CI update, and strings for the letterboxing size indicator.
Apart from that, there are the conflicts I found also in the Base Browser part.
Range-diff has some noise, mostly due to squashing.