Skip to content

Tor Browser 12.5a 102.8.0esr rebase

Pier Angelo Vendramerequested to merge
pierov/tor-browser:tor-browser-102.8.0esr-12.5-1 into tor-browser-102.8.0esr-12.5-1

Merge Info

Related Issues

Backport Timeline

  • Immediate - patchsets for critical bug fixes or other major blocker (e.g. fixes for a 0-day exploit) OR patchsets with trivial changes which do not need testing (e.g. fixes for typos or fixes easily verified in a local developer build)
  • 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 - patchset for the next major stable

Upstream Merging

  • Merge to base-browser - typically for !fixups to patches in the base-browser branch, though sometimes new patches as well

    • NOTE: if your changeset includes patches to both base-browser and tor-browser please please make separate merge requests for each part

  • Issue Tracking

Change Description

This is the rebase to 102.8.0esr for the Tor Browser alpha.

Once it's reviewed I'll update the base-browser branch to point to before the Makefile commit.

This was not a clean cherry-pick.

In particular, Mozilla uplifted a patch that changes ShouldResistFingerprint, for which we needed a complete refactor of "Bug 41116: Normalize system fonts.". I've used the latest version I sent to Mozilla.

Also, we had to modify the patch on Document.cpp of the about:torconnect page (and we should double check if we actually need a C++ patch to keep the dark theme in that page).

Another change on Moz's side was that they decided to force the update of channel-prefs.js (see Bug 1804303). Firefox on macOS has a watershed update for that... which is worrying.

There might be some nonsense for users of older Tor Browsers. And we don't really have a way to check for this in the updater, since we need a Tor Browser based on a very old version of Firefox (< 70).

In addition to that, we had our own nonsense, but the diff of diff looks quite clean. The expected differences are the one I've linked above, and a few commits that we cherry-picked to 102.7 (i.e., the ones to support Python 3.11, and the distrust of TrustCor).

The range-diff is less clean:

  • Base Browser's .mozconfigs. has had several big changes
  • Bug 9173: Change the default Firefox profile directory to be relative. has had yet another important refactor, I missed a clang-format before the merge, and I've moved the check on MOZ_TELEMETRY_REPORTING there (I can revert this to its previous commit, if preferred)
  • Bug 40253: Explicitly allow NoScript in Private Browsing mode.: git is a big confused, and takes the amend! instead
  • Bug 31575: Disable Firefox Home (Activity Stream): I've moved 9514e0c6 to it
  • Bug 10760: Integrate TorButton to TorBrowser core: we've moved some features from it to commits on their own, but the reviewer should double check that everything for about:tor is right
  • Bug 4234: Use the Firefox Update Process for Tor Browser.: some changes for the profile directory patch update, and a small block not to show the fake build date we use in alphas
  • Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser: moved the menu item there from the torbutton commit

Merge request reports