Bug 41478: Created a 102.5-based 12.5 branch that embeds Torbutton in it

Starting with 12.5, we don't want to use torbutton as a submodule anymore.

So, this MR creates the first tree for 12.5 and embeds torbutton.

Closes #41478 (closed).

assigned to @pierov

added 20 commits

• d846450f - Bug 10760: Integrate TorButton to TorBrowser core
• b618ca27 - Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
• 5892bfc5 - Add TorStrings module for localization
• 5faa5f9c - Bug 14631: Improve profile access error messages.
• 0bd7bcd5 - Bug 40209: Implement Basic Crypto Safety
• 7b94575c - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 2e3dfc74 - Bug 40807: Added QRCode.js to toolkit/modules
• 89cb00dd - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• 3e17a881 - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• 279f9fda - Bug 12620: TorBrowser regression tests
• 50122120 - Bug 4234: Use the Firefox Update Process for Tor Browser.
• 74aca572 - Bug 13379: Sign our MAR files.
• 9b6d6a05 - Bug 16940: After update, load local change notes.
• f70a8f84 - Bug 32658: Create a new MAR signing key
• 597e86cd - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• 045fbe93 - Bug 23247: Communicating security expectations for .onion
• a2e76125 - Bug 30237: Add v3 onion services client authentication prompt
• bb9c60dd - Bug 21952: Implement Onion-Location
• 08593e67 - Bug 40458: Implement .tor.onion aliases
• 7a528b5e - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser

Compare with previous version

marked this merge request as ready

added 20 commits

• 49bd8f64 - Bug 10760: Integrate TorButton to TorBrowser core
• 35716c52 - Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
• 720e280e - Add TorStrings module for localization
• 2b0273e8 - Bug 14631: Improve profile access error messages.
• 33118559 - Bug 40209: Implement Basic Crypto Safety
• 56f3d2ab - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 4e0d30b2 - Bug 40807: Added QRCode.js to toolkit/modules
• 6ee3dcd8 - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• 22a1e679 - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• 16bfdea8 - Bug 12620: TorBrowser regression tests
• 5158a4a7 - Bug 4234: Use the Firefox Update Process for Tor Browser.
• ee64f62c - Bug 13379: Sign our MAR files.
• 8e4fe44c - Bug 16940: After update, load local change notes.
• f33f4fb3 - Bug 32658: Create a new MAR signing key
• 766a2dfa - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• bf31bf64 - Bug 23247: Communicating security expectations for .onion
• 7c95cb15 - Bug 30237: Add v3 onion services client authentication prompt
• 4fb1cf2c - Bug 21952: Implement Onion-Location
• 9b538a1c - Bug 40458: Implement .tor.onion aliases
• 5ebc0375 - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser

Compare with previous version

added 18 commits

• df62ba47 - Add TorStrings module for localization
• 12d75996 - Bug 14631: Improve profile access error messages.
• e142ef96 - Bug 40209: Implement Basic Crypto Safety
• a3076e10 - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 0f6c6be4 - Bug 40807: Added QRCode.js to toolkit/modules
• c521eefd - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• 204f7307 - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• 91fe89b8 - Bug 12620: TorBrowser regression tests
• 61d63620 - Bug 4234: Use the Firefox Update Process for Tor Browser.
• d28a9c96 - Bug 13379: Sign our MAR files.
• f8c23053 - Bug 16940: After update, load local change notes.
• 7507ef86 - Bug 32658: Create a new MAR signing key
• 75c9e89a - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• 5927271e - Bug 23247: Communicating security expectations for .onion
• b3f3ff92 - Bug 30237: Add v3 onion services client authentication prompt
• b170b71b - Bug 21952: Implement Onion-Location
• e83f1388 - Bug 40458: Implement .tor.onion aliases
• 0fba89b0 - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser

Compare with previous version

requested review from @ma1

added 20 commits

• f1b390df - Bug 10760: Integrate TorButton to TorBrowser core
• 9f4a7c1f - Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
• 310c46ec - Add TorStrings module for localization
• b8fddfe9 - Bug 14631: Improve profile access error messages.
• b6430db8 - Bug 40209: Implement Basic Crypto Safety
• f7bf3455 - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 9a3a7d3a - Bug 40807: Added QRCode.js to toolkit/modules
• 26608418 - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• e58aa47f - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• 28e3c593 - Bug 12620: TorBrowser regression tests
• ac13d57e - Bug 4234: Use the Firefox Update Process for Tor Browser.
• 23dfaae6 - Bug 13379: Sign our MAR files.
• 819931c2 - Bug 16940: After update, load local change notes.
• 2c5a7c32 - Bug 32658: Create a new MAR signing key
• 98de66cd - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• 9e9aff4a - Bug 23247: Communicating security expectations for .onion
• ab823b03 - Bug 30237: Add v3 onion services client authentication prompt
• c2244be3 - Bug 21952: Implement Onion-Location
• beedeab0 - Bug 40458: Implement .tor.onion aliases
• 8a19babb - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser

Compare with previous version

As written in the issue, I have changed torbutton's path to make our life easier to switch between versions that have it as a submodule and versions that have it embedded.

Also, if I understand correctly, chrome.manifest was required to pack a .xpi, but now we handle everything in jar.mn in lines that start with %.

I have tried to remove that file locally, and everything still worked, but I haven't clobbered.

So, I'm trying to remove it also from the commits in the MR. If needed, we can add it back.

added 19 commits

• 68c1951a - Bug 10760: Integrate TorButton to TorBrowser core
• 8d0a090b - Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
• 9dadc6c2 - Bug 14631: Improve profile access error messages.
• c9ce2c9c - Bug 40209: Implement Basic Crypto Safety
• 6c882a2b - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 62fa92a0 - Bug 40807: Added QRCode.js to toolkit/modules
• 0027988b - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• da585d14 - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• e5dce23e - Bug 12620: TorBrowser regression tests
• 5ec469ca - Bug 4234: Use the Firefox Update Process for Tor Browser.
• a75e5dda - Bug 13379: Sign our MAR files.
• 156d75f2 - Bug 16940: After update, load local change notes.
• ae69d916 - Bug 32658: Create a new MAR signing key
• 4a102377 - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• d4f0ffde - Bug 23247: Communicating security expectations for .onion
• 6e67aafc - Bug 30237: Add v3 onion services client authentication prompt
• b3be190f - Bug 21952: Implement Onion-Location
• 9a72e300 - Bug 40458: Implement .tor.onion aliases
• d63c0d2c - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser

Compare with previous version

added 19 commits

• 8dc97532 - Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
• caf7e721 - Add TorStrings module for localization
• a19ac6dd - Bug 14631: Improve profile access error messages.
• 31aa7b91 - Bug 40209: Implement Basic Crypto Safety
• b99d111b - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 9cb97c77 - Bug 40807: Added QRCode.js to toolkit/modules
• eba95a45 - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• 0cdd068f - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• 2876f054 - Bug 12620: TorBrowser regression tests
• 5f2528a2 - Bug 4234: Use the Firefox Update Process for Tor Browser.
• 158e3635 - Bug 13379: Sign our MAR files.
• 70da3330 - Bug 16940: After update, load local change notes.
• 07e2440c - Bug 32658: Create a new MAR signing key
• 581f497d - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• d60dc66c - Bug 23247: Communicating security expectations for .onion
• d84a0b1a - Bug 30237: Add v3 onion services client authentication prompt
• 3fc8dff4 - Bug 21952: Implement Onion-Location
• bd6c16d4 - Bug 40458: Implement .tor.onion aliases
• 00091ee4 - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser

Compare with previous version

marked this merge request as draft

Drafting because I'd squash directly !467 (merged) once it's approved.

Also, for review:

git range-diff FIREFOX_102_5_0esr_RELEASE..tor-browser-102.5.0esr-12.0-1 FIREFOX_102_5_0esr_RELEASE..HEAD

It should tell that "Bug 10760: Integrate TorButton to TorBrowser core" and "Add TorStrings module for localization" have completely changed, which is expected .

Fixups to 10760 are either not needed (the submodule update), or already squashed if they are merged before this (!467 (merged), hopefully).

added 22 commits

• 8284ca47 - Bug 10760: Integrate TorButton to TorBrowser core
• be2995b8 - Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
• e3e537ab - Add TorStrings module for localization
• 42f59a93 - Bug 14631: Improve profile access error messages.
• 9ad6fef1 - Bug 40209: Implement Basic Crypto Safety
• bf2c0be2 - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 6acee3d8 - Bug 40807: Added QRCode.js to toolkit/modules
• 22d0289e - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• d03495d7 - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• 0c9785ff - Bug 12620: TorBrowser regression tests
• 3a2b681a - Bug 4234: Use the Firefox Update Process for Tor Browser.
• c9c067f4 - Bug 13379: Sign our MAR files.
• 659d2d9b - Bug 16940: After update, load local change notes.
• 11c69e9f - Bug 32658: Create a new MAR signing key
• 17fd5aeb - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• 51e9b1d9 - Bug 23247: Communicating security expectations for .onion
• 06288d4b - Bug 30237: Add v3 onion services client authentication prompt
• 926ed274 - Bug 21952: Implement Onion-Location
• 064bc709 - Bug 40458: Implement .tor.onion aliases
• 731b6ffe - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
• b08c4aa8 - fixup! Firefox preference overrides.
• ab73ab30 - fixup! Firefox preference overrides.

Compare with previous version

marked this merge request as ready

added 1 commit

• c26ebb5d - fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser

Compare with previous version

marked this merge request as draft from pierov/tor-browser@c26ebb5d

marked this merge request as ready

added 1 commit

• 60c7b09b - Bug 41435: Add a Tor Browser migration function

Compare with previous version

added 57 commits

• 61f4c44e - Firefox preference overrides.
• 93cfb0c6 - Bug 41043: Hardcode the UI font on Linux
• f15dfabb - Bug 30605: Honor privacy.spoof_english in Android
• 4c41389e - Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView
• 5bdce6ba - Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware
• 7b3270fb - Bug 26345: Hide tracking protection UI
• dcd37e4f - Bug 9173: Change the default Firefox profile directory to be relative.
• 4fb3bf2d - Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp
• c57ba744 - Bug 27604: Fix addon issues when moving the profile directory
• 609f160a - Bug 13028: Prevent potential proxy bypass cases.
• dfa78455 - Bug 11641: Disable remoting by default.
• d2a12086 - Bug 23104: Add a default line height compensation
• a9eaddbc - Bug 40309: Avoid using regional OS locales
• d3692138 - Bug 40432: Prevent probing installed applications
• 033d9e95 - Bug 41434: Letterboxing, preemptively apply margins in a global CSS rule to...
• b5b4ca47 - Bug 41434: Letterboxing, improve logging.
• 99f8a33f - Bug 31064: Letterboxing, exempt browser extensions.
• b602ad18 - Bug 32411: Letterboxing, exempt view-source: URIs.
• c31dba58 - Bug 32220: Improve the letterboxing experience
• 0e3e8f8e - Bug 40069: Add helpers for message passing with extensions
• 13e4dd20 - Bug 40253: Explicitly allow NoScript in Private Browsing mode.
• f0e75b46 - Bug 41369: Improve Firefox language settings for multi-lingual packages
• b68f4f8a - Bug 41371: Temporary hack to fix language selector popup position
• af6ad37e - Bug 41417: Always prompt users to restart after changing language
• 16b3cf5e - Bug 40925: Implemented the Security Level component
• c032e368 - Bug 40926: Implemented the New Identity feature
• f49d1f99 - Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
• 47dcea75 - Bug 2176: Rebrand Firefox to TorBrowser
• 0baeea91 - Bring back old Firefox onboarding
• 7cbd0729 - Bug 26961: New user onboarding.
• e31bd50f - TB3: Tor Browser's official .mozconfigs.
• dba2cf96 - Bug 41340: Enable TOR_BROWSER_NIGHTLY_BUILD features for dev and nightly builds
• c9bc13ba - Bug 40562: Added Tor Browser preferences to 000-tor-browser.js
• 532f1f52 - Bug 13252: Do not store data in the app bundle
• 2916e169 - Bug 40933: Add tor-launcher functionality
• 5626decc - Bug 40597: Implement TorSettings module
• e1eb5ce8 - Bug 10760: Integrate TorButton to TorBrowser core
• 17fffe58 - Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources.
• 783b8cf3 - Add TorStrings module for localization
• 6f76ad96 - Bug 14631: Improve profile access error messages.
• f54fd382 - Bug 40209: Implement Basic Crypto Safety
• 12cbc34d - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 485f466a - Bug 40807: Added QRCode.js to toolkit/modules
• 50989f99 - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• 2d2112b1 - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• d3635495 - Bug 12620: TorBrowser regression tests
• 61bdab92 - Bug 4234: Use the Firefox Update Process for Tor Browser.
• 46987958 - Bug 13379: Sign our MAR files.
• a01b9698 - Bug 16940: After update, load local change notes.
• 73b11384 - Bug 32658: Create a new MAR signing key
• 45738a36 - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• af521cdb - Bug 23247: Communicating security expectations for .onion
• a9eb0814 - Bug 30237: Add v3 onion services client authentication prompt
• 870eb07b - Bug 21952: Implement Onion-Location
• 723256c2 - Bug 40458: Implement .tor.onion aliases
• e7c6f470 - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
• 3c26cc87 - Bug 41435: Add a Tor Browser migration function

Compare with previous version

added 19 commits

• 9cb8ed96 - Add TorStrings module for localization
• 75c646cd - Bug 14631: Improve profile access error messages.
• 21bcd0d1 - Bug 40209: Implement Basic Crypto Safety
• 4d3e604d - Bug 19273: Avoid JavaScript patching of the external app helper dialog.
• 314cbb35 - Bug 40807: Added QRCode.js to toolkit/modules
• 1189636d - Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
• 9a5cc41c - Bug 27476: Implement about:torconnect captive portal within Tor Browser
• 5ff7009a - Bug 12620: TorBrowser regression tests
• 75c098c3 - Bug 4234: Use the Firefox Update Process for Tor Browser.
• a508c223 - Bug 13379: Sign our MAR files.
• da797dc2 - Bug 16940: After update, load local change notes.
• 9c7cf3a6 - Bug 32658: Create a new MAR signing key
• fa273aa8 - Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing
• ca2c4de3 - Bug 23247: Communicating security expectations for .onion
• e77d32f1 - Bug 30237: Add v3 onion services client authentication prompt
• ca4e14cc - Bug 21952: Implement Onion-Location
• eda88db0 - Bug 40458: Implement .tor.onion aliases
• 9d56a068 - Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser
• 47cb5451 - Bug 41435: Add a Tor Browser migration function

Compare with previous version