Bug 40739: tor-expert-bundle should include ClientTransportPlugin torrc lines...

Merge Info

• Related Issues

  • #40739 (closed)

• 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

• Issue Tracking

  • Link resolved issues with appropriate Release Prep issue for changelog generation

Change Description

This patch adds a pt_config.json file containing:

• the default preferred bridge type
• built-in bridge lines
• torrc ClientTransportPlugin lines

The pt_config.json file in the tor-expert-bundle directory has two placeholders in:

• ${pt_path} : to be swapped out by consuming applications with actual path of the pluggable transports directory (relative to the tor daemon process's working directory)
• ${pt_extension} : swapped out by the tor-expert-bundle build script with either .exe for Windows targets or .so for Android targets

Future MRs for #40741 (closed) will consume pt_config.json in the Tor Browser build process.

After #40741 (closed) we can remove the existing bridge string text files.