Skip to content

Rebased onto Firefox 115.3.1esr

Pier Angelo Vendrame requested to merge pierov/tor-browser:rebase-115.3.1 into tor-browser-115.3.1esr-13.0-1

Merge Info

Related Issues

  • tor-browser#xxxxx
  • mullvad-browser#xxxxx
  • tor-browser-build#xxxxx

Backporting

Timeline

  • Immediate: patchset needed as soon as possible
  • 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
  • No Backport (preferred): patchset for the next major stable

(Optional) Justification

  • Emergency security update: patchset fixes CVEs, 0-days, etc
  • 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
  • Other: please explain

Merging

  • Merge to tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • Merge to base-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • NOTE: if your changeset includes patches to both base-browser and tor-browser please clearly label in the change description which commits should be cherry-picked to base-browser after merging

Issue Tracking

Review

Request Reviewer

  • Request review from an applications developer depending on modified system:
    • NOTE: if the MR modifies multiple areas, please /cc all the relevant reviewers (since gitlab only allows 1 reviewer)
    • accessibility : henry
    • android : clairehurst, dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • macos : clairehurst, dan
    • nightly builds : boklm
    • rebases/release-prep : dan, ma1, pierov, richard
    • security : ma1
    • signing : boklm, richard
    • updater : pierov
    • misc/other : pierov, richard

Change Description

Let's rebase to make sure we haven't lost patches in Base Browser/Mullvad Browser.

Also, let's start with a clean base.

I've left unsquashed only the commits that weren't in 13.0a6 (only 3).

We have alphas to investigate on other possible problems, shall we get them in 13.0 stable.

How Tested

Not tested with a build 😄.

But usual diff of diff and range-diff.

The range-diff pre-squash was perfect, I can upload it to a separate branch, if needed (the commit hash was c78487f52ff330e7d51ef29be99593959d82f425, in case).

Diff of diff is missing the patches we cherry-picked from 115.3.1, since we now have them already in the Moz part.

Merge request reports