Pier Angelo Vendrame pushed to branch tor-browser-102.6.0esr-12.0-1 at The Tor Project / Applications / Tor Browser

Commits:

• 83bd811c
  by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00

  fixup! Bug 10760: Integrate TorButton to TorBrowser core
  
  Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series
  
  Removed the torbutton submodule
  

• 465fc665
  by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00

  fixup! Bug 10760: Integrate TorButton to TorBrowser core
  
  Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series
  
  Checked out toolkit/torbutton/ from dbaaa5df.
  

• 1a3dda31
  by Alex Catarineu at 2023-01-11T17:55:35+00:00

  fixup! Add TorStrings module for localization
  
  Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series
  
  Cherry-picked the new TorStrings commit.
  

• 750d8085
  by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00

  fixup! Add TorStrings module for localization
  
  Bug 41563: Fix old placeholders in TorStrings.jsm
  

• 9b8cdc2c
  by hackademix at 2023-01-11T17:55:35+00:00

  fixup! Bug 10760: Integrate TorButton to TorBrowser core
  
  Bug 41561: fix maximize warning notifications.
  

• 67d5b272
  by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00

  Revert "Bug 41520: (Regression) Rearranging bookmarks / place items by drag & drop doesn't work anymore"
  
  This reverts commit 8825bcad66f9ad96c29258cc57bfdb92a6437b1b.
  

• 556068cd
  by hackademix at 2023-01-11T17:55:35+00:00

  Bug 8324: Prevent DNS proxy bypasses caused by Drag&Drop
  

• 3b425ef2
  by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00

  fixup! Bug 27476: Implement about:torconnect captive portal within Tor Browser
  
  Changed placeholders for strings as we switched from dtd to .properties.
  

• 3203dab0
  by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00

  fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
  
  Changed placeholders for strings as we switched from dtd to .properties.
  

• 7c6101a6
  by Henry Wilkes at 2023-01-11T17:55:35+00:00

  fixup! Bug 10760: Integrate TorButton to TorBrowser core
  
  Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series
  
  Fixed a problem with linting
  

• c0a310eb
  by Pier Angelo Vendrame at 2023-01-11T17:55:35+00:00

  fixup! Bug 40209: Implement Basic Crypto Safety
  
  Bug 41522: Backport torbutton -> tor-browser migration to 12.0 series
  
  Restore crypto safety strings.
  

30 changed files:

• .gitmodules
• browser/components/torconnect/content/aboutTorConnect.js
• browser/components/torpreferences/content/connectionPane.js
• browser/modules/TorStrings.jsm
• toolkit/moz.build
• + toolkit/torbutton/CREDITS
• + toolkit/torbutton/LICENSE
• + toolkit/torbutton/chrome/content/aboutTor/aboutTor-content.js
• + toolkit/torbutton/chrome/content/aboutTor/aboutTor.xhtml
• + toolkit/torbutton/chrome/content/aboutTor/resources/aboutTor.js
• + toolkit/torbutton/chrome/content/tor-circuit-display.js
• + toolkit/torbutton/chrome/content/torbutton.js
• + toolkit/torbutton/chrome/locale/en-US/aboutDialog.dtd
• + toolkit/torbutton/chrome/locale/en-US/aboutTBUpdate.dtd
• + toolkit/torbutton/chrome/locale/en-US/aboutTor.dtd
• + toolkit/torbutton/chrome/locale/en-US/brand.dtd
• + toolkit/torbutton/chrome/locale/en-US/brand.properties
• + toolkit/torbutton/chrome/locale/en-US/branding/brand.ftl
• + toolkit/torbutton/chrome/locale/en-US/browserOnboarding.properties
• + toolkit/torbutton/chrome/locale/en-US/cryptoSafetyPrompt.properties
• + toolkit/torbutton/chrome/locale/en-US/onboarding.properties
• + toolkit/torbutton/chrome/locale/en-US/onionLocation.properties
• + toolkit/torbutton/chrome/locale/en-US/rulesets.properties
• + toolkit/torbutton/chrome/locale/en-US/settings.properties
• + toolkit/torbutton/chrome/locale/en-US/torConnect.properties
• + toolkit/torbutton/chrome/locale/en-US/torbutton.dtd
• + toolkit/torbutton/chrome/locale/en-US/torbutton.properties
• + toolkit/torbutton/chrome/locale/en-US/torlauncher.properties
• + toolkit/torbutton/chrome/skin/about-wordmark.png
• + toolkit/torbutton/chrome/skin/aboutDialog.css

The diff was not included because it is too large.