Skip to content

TB 43415 (part 2): Cherry-picks from 128.9.0esr

Pier Angelo Vendramerequested to merge
pierov/tor-browser:43415-rebase-134-cherry-pick into tor-browser-134.0a1-15.0-1

Merge Info

Issues

Resolves

Related

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

Merging

Target Branches

  • tor-browser - !fixups to tor-browser-specific commits, new features, security backports
  • base-browser and mullvad-browser - !fixups to base-browser-specific commits, new features to be shared with mullvad-browser, and security backports
    • ⚠️ IMPORTANT: Please list the base-browser-specific commits which need to be cherry-picked to the base-browser and mullvad-browser branches here

Target Channels

  • Alpha: esr128-14.5
  • Stable: esr128-14.0
  • Legacy: esr115-13.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)
  • 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

Upstream

  • Patchset is a candidate for uplift to Firefox
  • Patchset is a backport from Firefox
    • Bugzilla link:
    • Upstream commit:

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
    • 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

Change Description

Cherry-picked from tor-browser-128.9.0esr-14.5-1-build1 to the HEAD of tor-browser-128.9.0esr-14.5-1.

I excluded:

  • fixups to the Android survey, as it was excluded from 133
  • Bug 1950056: it's an upstream backport, generally speaking we don't want them

In addition to that, 4c0cf5ef doesn't match because it's a oneliner and its surrounding context has changed.

1c2cd6e8 also doesn't match because in 133 the removed lines were already before disableTor.

However, we should be good.

How Tested

Range-diff (adapt your remotes if needed):

git range-diff tor-browser-128.9.0esr-14.5-1-build1..upstream/tor-browser-128.9.0esr-14.5-1 tor-browser-134.0a1-15.0-1-build1..pierov/43415-rebase-134-cherry-pick

Diff of diff is a bit harder to review this time, because of the changed aforementioned.

Edited by Pier Angelo Vendrame

Merge request reports