Skip to content

Bug 40741: Update browser, and tor-android-service projects to populate PT...

richard requested to merge richard/tor-browser-build:bug_40741 into main

Merge Info

Related Issues



  • 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
  • Other: please explain

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

Updates browser to populate bridge prefs (default bridge and bridge lines) and the default torrc file from the tor-expert-bundle's pt_config.json file. PT base paths are pulled from the browser config's var/pt_path variable. Usage of the bridge line text files is removed.

Updates tor-android-service project to get bridge lines from pt_config.json.

Unraveling tor-onion-proxy-librarys patch files seemed like more of a mess then I want to deal with, especially given this code is going away with the transition to Arti with Sponsor 96 work in Q4.

How Tested

Doing a final testbuild on tb-build-03, will verify platforms before marking this MR as ready:

/cc @pierov @boklm

Edited by richard

Merge request reports