Skip to content

Bug 44131: Move torrc-defaults to data dir

brizentalrequested to merge
brizental/tor-browser:44131-torrcdefaults into tor-browser-140.4.0esr-15.0-1

Merge Info

Issues

Resolves

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: esr140-15.0
  • Stable: esr128-14.5
  • 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

Review

Change Description

With the changes from tor-browser-build!1307 (merged) torrc-defaults is now in the expert bundle so we can also copy it over to the data directory. This should now make tor work properly with just ./mach bootstrap + build + run.

I had to change a bit how we create the file index as well, because we were using filename to generate it but the expert bundle's file name is always the same -- it's in a subfolder. With an immutable index, bootstrap didn't know to re-download it whenever it changed. I changed it to get the name of the containing folder for an index when the artifact is the expert bundle. Gotta remember to also apply this change to the Android MR.

How Tested

Built and run with:

./mach bootstrap
./mach build
./mach run

Tor now works 🎉

Merge request reports