Skip to content

Bug 42366: Tor Browser 115.7.0esr alpha rebase

Pier Angelo Vendrame requested to merge pierov/tor-browser:bug_42366 into tor-browser-115.7.0esr-13.5-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
  • Localization: typos and other localization changes that should be also in the release branch
  • 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

Rebased the alpha. Lots of fun when moving commits to their position.

Also removed YEC.

How Tested

Diff of diff, it's quite clean (except for YEC removal).

Range diff with opposite ranges:

git range-diff FIREFOX_115_7_0esr_BUILD1..pierov/bug_42366 FIREFOX_115_6_0esr_BUILD1..upstream/tor-browser-115.6.0esr-13.5-1

At that point, the commits to stash are all grouped together, and it becomes quite trivial to compare their diffs (you get the diff of the squashed commit in 115.7.0esr and create a diff file for the ranges it replaces from 115.6.0esr).

Merge request reports