Skip to content

Bug 42247: Tor integration changes for Android that affect also desktop

Merge Info

Related Issues

  • !852 (merged)
  • tor-browser#xxxxx
  • mullvad-browser#xxxxx
  • tor-browser-build#xxxxx



  • 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


  • 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


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

This is a series of changes originally made for !852 (merged) that apply also to desktop code.

They're easy enough, but since they change also desktop code, let's get them merged ASAP to have them tested as soon as possible.

How Tested

  1. Made sure we still bootstrap
  2. Made sure we don't have strange errors in the browser console
  3. Checked the circuit display is still updated, and that the exit IP corresponds to the IP shown by sites like check.tpo and
  4. Checked that delaying a change page with setTimeout(() => { location.href = "https://..." }, 10000) in a tab that isn't focused doesn't change the circuit display of the page that is focused. But check also that switching to that tab shows a different circuit (use two different FPDs for this test)
  5. Check that domain fronted requests (e.g., request bridges to bridgedb) still works after this

Merge request reports