This is an automated email from the git hooks/post-receive script.

pierov pushed a commit to branch master in repository torbutton.

The following commit(s) were added to refs/heads/master by this push: new 3f613cc8 Bug 40458: Implement .tor.onion aliases 3f613cc8 is described below

commit 3f613cc84cd48fb06f12163d79550c36b354a2a5 Author: Pier Angelo Vendrame pierov@torproject.org AuthorDate: Fri Mar 11 10:45:53 2022 +0100

Bug 40458: Implement .tor.onion aliases

Show the real .onion domain on the circuit display when using a .tor.onion alias. --- chrome/content/tor-circuit-display.js | 6 ++++++ chrome/locale/en-US/torbutton.properties | 31 +++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+)

diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js index f6dd9ace..14e3da5b 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js @@ -285,6 +285,12 @@ let currentCircuitData = function (browser) { let [SOCKS_username, SOCKS_password] = credentials; let nodeData = credentialsToNodeDataMap.get(`${SOCKS_username}|${SOCKS_password}`); let domain = SOCKS_username; + if (browser.documentURI.host.endsWith(".tor.onion")) { + const service = Cc["@torproject.org/onion-alias-service;1"].getService( + Ci.IOnionAliasService + ); + domain = service.getOnionAlias(browser.documentURI.host); + } return { domain, nodeData }; } } diff --git a/chrome/locale/en-US/torbutton.properties b/chrome/locale/en-US/torbutton.properties index 22db4f4b..5a01d1ba 100644 --- a/chrome/locale/en-US/torbutton.properties +++ b/chrome/locale/en-US/torbutton.properties @@ -154,3 +154,34 @@ cryptoSafetyPrompt.primaryAction=Reload Tab with a New Circuit cryptoSafetyPrompt.primaryActionAccessKey=R cryptoSafetyPrompt.secondaryAction=Dismiss Warning cryptoSafetyPrompt.secondaryActionAccessKey=B + +# about:rulesets strings. +rulesets.warningTitle=Proceed with Caution +rulesets.warningDescription=Adding or modifying rulesets can cause attackers to hijack your browser. Proceed only if you know what you are doing. +rulesets.warningEnable=Warn me when I attempt to access these preferences +rulesets.warningButton=Accept the Risk and Continue +# Ruleset list +rulesets.rulesets=Rulesets +rulesets.noRulesets=No rulesets found +rulesets.noRulesetsDescr=When you save a ruleset in Tor Browser, it will show up here. +# LOCALIZATION NOTE: %S will be replaced by the update date (automatically formatted by Firefox's l10n component) +rulesets.lastUpdated=Last updated %S +rulesets.neverUpdated=Never updated, or last update failed +rulesets.enabled=Enabled +rulesets.disabled=Disabled +# Ruleset details/edit ruleset +rulesets.edit=Edit +rulesets.name=Name +rulesets.jwk=JWK +rulesets.pathPrefix=Path Prefix +rulesets.scope=Scope +rulesets.enable=Enable this ruleset +rulesets.checkUpdates=Check for Updates +rulesets.jwkPlaceholder=The key used to sign this ruleset in the JWK (JSON Web Key) format +rulesets.jwkInvalid=The JWK could not be parsed, or it is not a valid key +rulesets.pathPrefixPlaceholder=URL prefix that contains the files needed by the ruleset +rulesets.pathPrefixInvalid=The path prefix is not a valid HTTP(S) URL +rulesets.scopePlaceholder=Regular expression for the scope of the rules +rulesets.scopeInvalid=The scope could not be parsed as a regular expression +rulesets.save=Save +rulesets.cancel=Cancel \ No newline at end of file