Skip to content

Bug 41909: Rebased onto Firefox 115.1.0esr

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

Merge Info

Related Issues

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 : dan
    • build system : boklm
    • extensions : ma1
    • firefox internals (XUL/JS/XPCOM) : ma1
    • fonts : pierov
    • frontend (implementation) : henry
    • frontend (review) : donuts, richard
    • localization : henry, pierov
    • nightly builds : boklm
    • rebases/release-prep : dan_b, ma1, pierov, richard
    • security : ma1
    • signing : boklm, richard
    • updater : pierov
    • misc/other : pierov, richard

Change Description

Rebased onto Firefox 115.1.0esr.

The diff of diffs isn't clean and we have a regression on the support button. I think we might want to think about it a little more, so I opened #41910 (closed) to follow up.

In addition to that, I had another couple of small conflicts (the DDG icon, I used the new one from upstream) and another small change in an if close to a recent patch (I've taken our content inside the new if).

I've squashed the various fixups, because almost all of them were already in the right place.

This is the rule we gave to ourselves, but it feels a little bit wrong in this case, since we actually have rebased more than once without releasing. I still have the unsquashed head, in case.

Merge request reports