Bug 41796: Rebased on top of FIREFOX_ESR_115_BASE

Merge Info

Related Issues

• #41796 (closed)

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

• Link resolved issues with appropriate Release Prep issue for changelog generation

Change Description

The previous rebase was on Firefox 115 beta 5.

This is on FIREFOX_ESR_115_BASE, which is very close to FIREFOX_115_0esr_BUILD1.

Sadly, Mozilla doesn't provide an esr115 branch on gecko-dev, yet.

So, this is the last tag that is in common with gecko-dev/release.

The difference with the actual 115.0esr is 4 releng commits that we don't need.

I've done the rebase in two steps:

1. Reorder on top of beta 5. It had a few conflicts, but not too difficult to resolve.
2. Rebase from the reordered branch to FIREFOX_ESR_115_BASE. It was almost clean, except for a slight change in part of the code we remove on the search engine commit.

I've also replaced our old commit about using NSS for mars signatures with the uplifted one. Sadly it didn't make 115.

/cc @richard @dan @henry @ma1