Bug 41180+41224: Do not ship conjure, geoip and some small fixes

Merge Info

Related Issues

• tor-browser#xxxxx
• mullvad-browser#xxxxx
• #41180 (closed) #41224 (closed)

Backporting

Timeline

• 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

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

Review

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) : jwilde, ma1
  • fonts : pierov
  • frontend (implementation) : henry
  • frontend (review) : donuts, morgan
  • localization : henry, pierov
  • macOS : clairehurst, dan
  • nightly builds : boklm
  • rebases/release-prep : boklm, dan, ma1, morgan, pierov
  • security : jwilde, ma1
  • signing : boklm, morgan
  • updater : pierov
  • windows : jwilde, morgan
  • misc/other : morgan, pierov

Change Description

Stop shipping Conjure (Android x86/x86_64) and GeoIP (all Android) to save some space.

Warning: users who used to have Conjure bridges will have tor crash silently because we don't have a way to ship platform-dependent torrc-defaults (@dan/@clairehurst any suggestion for a way to do it?).

But the browser won't crash, and they'll be able to remove Conjure.

It should be enough for x86_64 (108695490 bytes), but it might not be enough for x86, I don't know.

x86 is 112435078, but resources.arsc alone is 112435078, so we are 177338 bytes over the 100000000 threshold, maybe we can try to build tor with -Os. Removing the Lox wasm blob might also help.

How Tested

Test build: https://tb-build-03.torproject.org/~pierov/torbrowser/alpha/unsigned/14.0a3-build110/

I checked the browser still works, and we don't have new errors.

Users who used to have Conjure bridges won't have a clue about what happend.

However, it might maybe be integrated in Lyrebird? See tpo/anti-censorship/pluggable-transports/conjure#42 (closed).