- tbb-commits - lists.torproject.org

[tor-browser] branch tor-browser-102.2.0esr-12.0-3 updated: fixup! Bug 40925: Implemented the Security Level component
by gitolite role 19 Sep '22

19 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-102.2.0esr-12.0-3 by this push: new ff839fde49f3c fixup! Bug 40925: Implemented the Security Level component ff839fde49f3c is described below commit ff839fde49f3c2d2581eda496b5bc8b4a3e60bdb Author: Henry Wilkes <henry(a)torproject.org> AuthorDate: Thu Sep 8 12:19:08 2022 +0100 fixup! Bug 40925: Implemented the Security Level component Clean up stray security level fluent ids with no associated string. --- .../components/securitylevel/content/securityLevelButton.inc.xhtml | 4 +--- .../components/securitylevel/content/securityLevelPanel.inc.xhtml | 6 ++---- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/browser/components/securitylevel/content/securityLevelButton.inc.xhtml b/browser/components/securitylevel/content/securityLevelButton.inc.xhtml index 2ca8fcde945c1..96ee1ec0ca499 100644 --- a/browser/components/securitylevel/content/securityLevelButton.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelButton.inc.xhtml @@ -4,6 +4,4 @@ onmousedown="SecurityLevelButton.onCommand(event);" onkeypress="SecurityLevelButton.onCommand(event);" closemenu="none" - cui-areatype="toolbar" - data-l10n-id="security-level-button" - /> + cui-areatype="toolbar"/> diff --git a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml index 0347ab5e70854..c485f819aba92 100644 --- a/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml +++ b/browser/components/securitylevel/content/securityLevelPanel.inc.xhtml @@ -34,11 +34,9 @@ </hbox> </vbox> <hbox class="panel-footer"> - <button id="securityLevel-restoreDefaults" - data-l10n-id="security-level-restore-defaults"/> + <button id="securityLevel-restoreDefaults"/> <button id="securityLevel-advancedSecuritySettings" - default="true" - data-l10n-id="security-level-change"/> + default="true"/> </hbox> </vbox> </panelview> -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch geckoview-102.2.0esr-12.0-1 updated: Bug 41089: Add tor-browser build scripts + Makefile to tor-browser
by gitolite role 19 Sep '22

19 Sep '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch geckoview-102.2.0esr-12.0-1 in repository tor-browser. The following commit(s) were added to refs/heads/geckoview-102.2.0esr-12.0-1 by this push: new b2c2c5f22bc06 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser b2c2c5f22bc06 is described below commit b2c2c5f22bc06df13ca02ae28e7cfcfcfa05e38f Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Mon Aug 1 17:56:45 2022 +0000 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser --- .gitignore | 3 ++ tools/torbrowser/Makefile | 44 ++++++++++++++++++++++++++ tools/torbrowser/bridges.js | 77 +++++++++++++++++++++++++++++++++++++++++++++ tools/torbrowser/build.sh | 7 +++++ tools/torbrowser/clobber.sh | 6 ++++ tools/torbrowser/config.sh | 6 ++++ tools/torbrowser/deploy.sh | 23 ++++++++++++++ tools/torbrowser/fetch.sh | 30 ++++++++++++++++++ tools/torbrowser/ide.sh | 7 +++++ tools/torbrowser/jslint.sh | 7 +++++ 10 files changed, 210 insertions(+) diff --git a/.gitignore b/.gitignore index b409ec583766d..b2b8b720c1787 100644 --- a/.gitignore +++ b/.gitignore @@ -193,3 +193,6 @@ config/external/icu4x # Ignore Storybook generated files browser/components/storybook/node_modules/ browser/components/storybook/storybook-static/ + +# Ignore binary base of tor browser +.binaries diff --git a/tools/torbrowser/Makefile b/tools/torbrowser/Makefile new file mode 100644 index 0000000000000..92650151560ec --- /dev/null +++ b/tools/torbrowser/Makefile @@ -0,0 +1,44 @@ +.DEFAULT_GOAL := all + +# https://stackoverflow.com/questions/18136918/how-to-get-current-relative-di… +mkfile_path := $(shell dirname $(realpath $(firstword $(MAKEFILE_LIST)))) + +DEV_ROOT = $(mkfile_path)/../.. +BINARIES = $(DEV_ROOT)/.binaries +BUILD_OUTPUT = $(DEV_ROOT)/obj-x86_64-pc-linux-gnu + +config: + ./config.sh $(DEV_ROOT) + +ide-vscode: + ./ide.sh vscode $(DEV_ROOT) + +ide-eclipse: + ./ide.sh eclipse $(DEV_ROOT) + +ide-visualstudio: + ./ide.sh visualstudio $(DEV_ROOT) + +fetch: + ./fetch.sh $(BINARIES) + +build: + ./build.sh $(DEV_ROOT) + +deploy: + ./deploy.sh $(BINARIES) $(BUILD_OUTPUT) + +all: build deploy + +run: + $(BINARIES)/dev/Browser/start-tor-browser -v + +jslint: + ./jslint.sh $(DEV_ROOT) $(JS) + +clobber: + ./clobber.sh $(DEV_ROOT) + +clean: + rm -rf $(BUILD_OUTPUT) + diff --git a/tools/torbrowser/bridges.js b/tools/torbrowser/bridges.js new file mode 100644 index 0000000000000..e8f11a36c401d --- /dev/null +++ b/tools/torbrowser/bridges.js @@ -0,0 +1,77 @@ +pref("extensions.torlauncher.default_bridge_recommended_type", "obfs4"); + +// Default bridges. +pref( + "extensions.torlauncher.default_bridge.obfs4.1", + "obfs4 192.95.36.142:443 CDF2E852BF539B82BD10E27E9115A31734E378C2 cert=qUVQ0srL1JI/vO6V6m/24anYXiJD3QP2HgzUKQtQ7GRqqUvs7P+tG43RtAqdhLOALP7DJQ iat-mode=1" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.2", + "obfs4 38.229.1.78:80 C8CBDB2464FC9804A69531437BCF2BE31FDD2EE4 cert=Hmyfd2ev46gGY7NoVxA9ngrPF2zCZtzskRTzoWXbxNkzeVnGFPWmrTtILRyqCTjHR+s9dg iat-mode=1" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.3", + "obfs4 38.229.33.83:80 0BAC39417268B96B9F514E7F63FA6FBA1A788955 cert=VwEFpk9F/UN9JED7XpG1XOjm/O8ZCXK80oPecgWnNDZDv5pdkhq1OpbAH0wNqOT6H6BmRQ iat-mode=1" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.4", + "obfs4 37.218.245.14:38224 D9A82D2F9C2F65A18407B1D2B764F130847F8B5D cert=bjRaMrr1BRiAW8IE9U5z27fQaYgOhX1UCmOpg2pFpoMvo6ZgQMzLsaTzzQNTlm7hNcb+Sg iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.5", + "obfs4 85.31.186.98:443 011F2599C0E9B27EE74B353155E244813763C3E5 cert=ayq0XzCwhpdysn5o0EyDUbmSOx3X/oTEbzDMvczHOdBJKlvIdHHLJGkZARtT4dcBFArPPg iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.6", + "obfs4 85.31.186.26:443 91A6354697E6B02A386312F68D82CF86824D3606 cert=PBwr+S8JTVZo6MPdHnkTwXJPILWADLqfMGoVvhZClMq/Urndyd42BwX9YFJHZnBB3H0XCw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.7", + "obfs4 144.217.20.138:80 FB70B257C162BF1038CA669D568D76F5B7F0BABB cert=vYIV5MgrghGQvZPIi1tJwnzorMgqgmlKaB77Y3Z9Q/v94wZBOAXkW+fdx4aSxLVnKO+xNw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.8", + "obfs4 193.11.166.194:27015 2D82C2E354D531A68469ADF7F878FA6060C6BACA cert=4TLQPJrTSaDffMK7Nbao6LC7G9OW/NHkUwIdjLSS3KYf0Nv4/nQiiI8dY2TcsQx01NniOg iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.9", + "obfs4 193.11.166.194:27020 86AC7B8D430DAC4117E9F42C9EAED18133863AAF cert=0LDeJH4JzMDtkJJrFphJCiPqKx7loozKN7VNfuukMGfHO0Z8OGdzHVkhVAOfo1mUdv9cMg iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.10", + "obfs4 193.11.166.194:27025 1AE2C08904527FEA90C4C4F8C1083EA59FBC6FAF cert=ItvYZzW5tn6v3G4UnQa6Qz04Npro6e81AP70YujmK/KXwDFPTs3aHXcHp4n8Vt6w/bv8cA iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.11", + "obfs4 209.148.46.65:443 74FAD13168806246602538555B5521A0383A1875 cert=ssH+9rP8dG2NLDN2XuFw63hIO/9MNNinLmxQDpVa+7kTOa9/m+tGWT1SmSYpQ9uTBGa6Hw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.12", + "obfs4 146.57.248.225:22 10A6CD36A537FCE513A322361547444B393989F0 cert=K1gDtDAIcUfeLqbstggjIw2rtgIKqdIhUlHp82XRqNSq/mtAjp1BIC9vHKJ2FAEpGssTPw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.13", + "obfs4 45.145.95.6:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.14", + "obfs4 [2a0c:4d80:42:702::1]:27015 C5B7CD6946FF10C5B3E89691A7D3F2C122D2117C cert=TD7PbUO0/0k6xYHMPW3vJxICfkMZNdkRrb63Zhl5j9dW3iRGiCx0A7mPhe5T2EDzQ35+Zw iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.15", + "obfs4 51.222.13.177:80 5EDAC3B810E12B01F6FD8050D2FD3E277B289A08 cert=2uplIpLQ0q9+0qMFrK5pkaYRDOe460LL9WHBvatgkuRr/SL31wBOEupaMMJ6koRE6Ld0ew iat-mode=0" +); +pref( + "extensions.torlauncher.default_bridge.obfs4.16", + "obfs4 185.100.87.30:443 5B403DFE34F4872EB027059CECAE30B0C864B3A2 cert=bWUdFUe8io9U6JkSLoGAvSAUDcB779/shovCYmYAQb/pW/iEAMZtO/lCd94OokOF909TPA iat-mode=2" +); + +pref( + "extensions.torlauncher.default_bridge.meek-azure.1", + "meek_lite 192.0.2.2:2 97700DFE9F483596DDA6264C4D7DF7641E1E39CE url=https://meek.azureedge.net/ front=ajax.aspnetcdn.com" +); + +pref( + "extensions.torlauncher.default_bridge.snowflake.1", + "snowflake 192.0.2.3:1 2B280B23E1107BB62ABFC40DDCC8824814F80A72" +); diff --git a/tools/torbrowser/build.sh b/tools/torbrowser/build.sh new file mode 100755 index 0000000000000..e53dbc5000bc7 --- /dev/null +++ b/tools/torbrowser/build.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 + +cd $DEV_ROOT +./mach build +./mach build stage-package diff --git a/tools/torbrowser/clobber.sh b/tools/torbrowser/clobber.sh new file mode 100755 index 0000000000000..5073454b23c10 --- /dev/null +++ b/tools/torbrowser/clobber.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 + +cd $DEV_ROOT +./mach clobber diff --git a/tools/torbrowser/config.sh b/tools/torbrowser/config.sh new file mode 100755 index 0000000000000..d353119613792 --- /dev/null +++ b/tools/torbrowser/config.sh @@ -0,0 +1,6 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 + +cd $DEV_ROOT +./mach configure diff --git a/tools/torbrowser/deploy.sh b/tools/torbrowser/deploy.sh new file mode 100755 index 0000000000000..9f2ebd58cbe3a --- /dev/null +++ b/tools/torbrowser/deploy.sh @@ -0,0 +1,23 @@ +#!/bin/bash +set -e +BINARIES=$1 +BUILD_OUTPUT=$2 + +SCRIPT_DIR=$(realpath "$(dirname "$0")") + +# Add built-in bridges +mkdir -p $BUILD_OUTPUT/_omni/defaults/preferences +cat $BUILD_OUTPUT/dist/bin/browser/defaults/preferences/000-tor-browser.js $SCRIPT_DIR/bridges.js >> $BUILD_OUTPUT/_omni/defaults/preferences/000-tor-browser.js +cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja defaults/preferences/000-tor-browser.js +rm -rf $BUILD_OUTPUT/_omni + +# Repackage the manual +# rm -rf $BUILD_OUTPUT/_omni +# mkdir $BUILD_OUTPUT/_omni +# unzip $BINARIES/dev/Browser/browser/omni.ja -d $BUILD_OUTPUT/_omni +# cd $BUILD_OUTPUT/_omni && zip -Xmr $BUILD_OUTPUT/dist/firefox/browser/omni.ja chrome/browser/content/browser/manual +# rm -rf $BUILD_OUTPUT/_omni + +# copy binaries +cp -r $BUILD_OUTPUT/dist/firefox/* $BINARIES/dev/Browser +rm -rf $BINARIES/dev/Browser/TorBrowser/Data/Browser/profile.default/startupCache diff --git a/tools/torbrowser/fetch.sh b/tools/torbrowser/fetch.sh new file mode 100755 index 0000000000000..5b5c627c0c343 --- /dev/null +++ b/tools/torbrowser/fetch.sh @@ -0,0 +1,30 @@ +#!/bin/sh +set -e + +BINARIES_DIR=$1 + +# download the current downloads.json +wget https://aus1.torproject.org/torbrowser/update_3/alpha/downloads.json +# get url for latest alpha linux en_US package +TOR_BROWSER_VERSION=$(grep -Eo "\"version\":\"[0-9.a]+\"" downloads.json | grep -Eo "[0-9.a]+") +TOR_BROWSER_PACKAGE="tor-browser-linux64-${TOR_BROWSER_VERSION}_en-US.tar.xz" +TOR_BROWSER_PACKAGE_URL="https://dist.torproject.org/torbrowser/${TOR_BROWSER_VERSION}/${TOR_BROWSER…" + +# remove download manifest +rm downloads.json + +# clear out previous tor-browser and previous package +rm -rf "${BINARIES_DIR}/dev" +rm -f "${TOR_BROWSER_PACKAGE}" + +# download +rm -f "${TOR_BROWSER_PACKAGE}" +wget "${TOR_BROWSER_PACKAGE_URL}" +mkdir -p "${BINARIES_DIR}" + +# and extract +tar -xf ${TOR_BROWSER_PACKAGE} -C "${BINARIES_DIR}" +mv "${BINARIES_DIR}/tor-browser_en-US" "${BINARIES_DIR}/dev" + +# cleanup +rm -f "${TOR_BROWSER_PACKAGE}" diff --git a/tools/torbrowser/ide.sh b/tools/torbrowser/ide.sh new file mode 100755 index 0000000000000..5da0c670d8c5b --- /dev/null +++ b/tools/torbrowser/ide.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +IDE=$1 +DEV_ROOT=$2 + +cd $DEV_ROOT +./mach ide $IDE diff --git a/tools/torbrowser/jslint.sh b/tools/torbrowser/jslint.sh new file mode 100755 index 0000000000000..be1016275c289 --- /dev/null +++ b/tools/torbrowser/jslint.sh @@ -0,0 +1,7 @@ +#!/bin/bash +set -e +DEV_ROOT=$1 +JS_FILE=$2 + +cd $DEV_ROOT +./mach lint -l eslint --fix $JS_FILE -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: Bug 40621: Update namecoin patches for linted TorButton
by gitolite role 09 Sep '22

09 Sep '22

This is an automated email from the git hooks/post-receive script. boklm pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new fc1170e Bug 40621: Update namecoin patches for linted TorButton fc1170e is described below commit fc1170e5d97b02f2da5bd938edf42ee7396b53b3 Author: Nicolas Vigier <boklm(a)torproject.org> AuthorDate: Wed Sep 7 16:39:54 2022 +0200 Bug 40621: Update namecoin patches for linted TorButton --- projects/firefox/namecoin-torbutton.patch | 198 ++++++++++++++++-------------- 1 file changed, 103 insertions(+), 95 deletions(-) diff --git a/projects/firefox/namecoin-torbutton.patch b/projects/firefox/namecoin-torbutton.patch index 4e92628..c923d68 100644 --- a/projects/firefox/namecoin-torbutton.patch +++ b/projects/firefox/namecoin-torbutton.patch @@ -1,8 +1,8 @@ diff --git a/chrome/content/tor-circuit-display.js b/chrome/content/tor-circuit-display.js -index d6034384..120d32a0 100644 +index e4b5ceea..fb0b8fc9 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js -@@ -48,7 +48,11 @@ let credentialsToNodeDataMap = new Map(), +@@ -58,7 +58,11 @@ let createTorCircuitDisplay = (function() { knownCircuitIDs = new Map(), // A mutable map that records the SOCKS credentials for the // latest channels for each browser + domain. @@ -13,112 +13,120 @@ index d6034384..120d32a0 100644 + // A mutable map from .bit[.onion] domains to .onion domains. + bitToOnionMap = {}; - // __trimQuotes(s)__. - // Removes quotation marks around a quoted string. -@@ -132,6 +136,28 @@ let getCircuitStatusByID = async function (aController, circuitID) { - return null; - }; + // __trimQuotes(s)__. + // Removes quotation marks around a quoted string. +@@ -153,6 +157,28 @@ let createTorCircuitDisplay = (function() { + return null; + }; -+// __collectBitTargets(aContoller)__. -+// Watches for STREAM NEW events. When a NEW event occurs, we will see -+// the stream's target domain. If that target is a .bit domain, then -+// we want to be sure to record this so we can later record if it is -+// remapped to a .onion domain. -+let collectBitTargets = function (aController) { -+ return aController.watchEvent( -+ "STREAM", -+ streamEvent => streamEvent.StreamStatus === "NEW", -+ async (streamEvent) => { -+ logger.eclog(3, "new streamEvent:" + JSON.stringify(streamEvent)); -+ if (streamEvent && streamEvent.StreamID && streamEvent.Target) { -+ let targetDomain = streamEvent.Target.split(":")[0]; -+ if (targetDomain.endsWith(".bit") || -+ targetDomain.endsWith(".bit.onion")) { -+ bitTargets[streamEvent.StreamID] = Services.eTLD.getBaseDomainFromHost(targetDomain); -+ logger.eclog(3, "stream on .bit domain: " + targetDomain); ++ // __collectBitTargets(aContoller)__. ++ // Watches for STREAM NEW events. When a NEW event occurs, we will see ++ // the stream's target domain. If that target is a .bit domain, then ++ // we want to be sure to record this so we can later record if it is ++ // remapped to a .onion domain. ++ let collectBitTargets = function (aController) { ++ return aController.watchEvent( ++ "STREAM", ++ streamEvent => streamEvent.StreamStatus === "NEW", ++ async (streamEvent) => { ++ logger.eclog(3, "new streamEvent:" + JSON.stringify(streamEvent)); ++ if (streamEvent && streamEvent.StreamID && streamEvent.Target) { ++ let targetDomain = streamEvent.Target.split(":")[0]; ++ if (targetDomain.endsWith(".bit") || ++ targetDomain.endsWith(".bit.onion")) { ++ bitTargets[streamEvent.StreamID] = Services.eTLD.getBaseDomainFromHost(targetDomain); ++ logger.eclog(3, "stream on .bit domain: " + targetDomain); ++ } + } -+ } -+ }); -+}; ++ }); ++ }; + - // __collectIsolationData(aController, updateUI)__. - // Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then - // we assume isolation settings (SOCKS username+password) are now fixed for the -@@ -145,6 +171,15 @@ let collectIsolationData = function (aController, updateUI) { - "STREAM", - streamEvent => streamEvent.StreamStatus === "SENTCONNECT", - async (streamEvent) => { -+ logger.eclog(3, "sentconnect streamEvent:" + JSON.stringify(streamEvent)); -+ // Collect any stream target that might be an onion. -+ if (streamEvent && streamEvent.StreamID && streamEvent.Target) { -+ let targetDomain = streamEvent.Target.split(":")[0]; -+ if (targetDomain.endsWith(".onion")) { -+ bitToOnionMap[bitTargets[streamEvent.StreamID]] = targetDomain; -+ logger.eclog(3, "mapped " + bitTargets[streamEvent.StreamID] + " to " + targetDomain); + // __collectIsolationData(aController, updateUI)__. + // Watches for STREAM SENTCONNECT events. When a SENTCONNECT event occurs, then + // we assume isolation settings (SOCKS username+password) are now fixed for the +@@ -166,6 +192,15 @@ let createTorCircuitDisplay = (function() { + "STREAM", + streamEvent => streamEvent.StreamStatus === "SENTCONNECT", + async streamEvent => { ++ logger.eclog(3, "sentconnect streamEvent:" + JSON.stringify(streamEvent)); ++ // Collect any stream target that might be an onion. ++ if (streamEvent && streamEvent.StreamID && streamEvent.Target) { ++ let targetDomain = streamEvent.Target.split(":")[0]; ++ if (targetDomain.endsWith(".onion")) { ++ bitToOnionMap[bitTargets[streamEvent.StreamID]] = targetDomain; ++ logger.eclog(3, "mapped " + bitTargets[streamEvent.StreamID] + " to " + targetDomain); ++ } + } -+ } - if (!knownCircuitIDs.get(streamEvent.CircuitID)) { - logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); - knownCircuitIDs.set(streamEvent.CircuitID, true); -@@ -312,7 +347,9 @@ let updateCircuitDisplay = function () { - } + if (!knownCircuitIDs.get(streamEvent.CircuitID)) { + logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); + knownCircuitIDs.set(streamEvent.CircuitID, true); +@@ -367,7 +402,9 @@ let createTorCircuitDisplay = (function() { + } - let domainParts = []; -- if (domain.endsWith(".onion")) { -+ logger.eclog(3, "bit to onion map:" + JSON.stringify(bitToOnionMap) + ", domain: " + domain); -+ let mappedOnion = bitToOnionMap[domain]; -+ if (domain.endsWith(".onion") || mappedOnion) { - for (let i = 0; i < 3; ++i) { - li(uiString("relay")); + let domainParts = []; +- if (domain.endsWith(".onion")) { ++ logger.eclog(3, "bit to onion map:" + JSON.stringify(bitToOnionMap) + ", domain: " + domain); ++ let mappedOnion = bitToOnionMap[domain]; ++ if (domain.endsWith(".onion") || mappedOnion) { + for (let i = 0; i < 3; ++i) { + li(uiString("relay")); + } +@@ -380,28 +417,32 @@ let createTorCircuitDisplay = (function() { + domainParts.push(domain); } -@@ -325,24 +362,28 @@ let updateCircuitDisplay = function () { - domainParts.push(domain); - } -- // We use a XUL html:span element so that the tooltiptext is displayed. -- li([ -- "html:span", -- { -- class: "circuit-onion", -- onclick: ` +- // We use a XUL html:span element so that the tooltiptext is displayed. +- li([ +- "html:span", +- { +- class: "circuit-onion", +- onclick: ` - this.classList.add("circuit-onion-copied"); - Cc[ - "@mozilla.org/widget/clipboardhelper;1" - ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) - `, -- "data-onion": domain, -- "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), -- "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), -- tooltiptext: domain, -- }, -- ...domainParts, -- ]); -+ if (mappedOnion) { -+ li(domain, " ", ["span", { class: "circuit-ip-address" }, mappedOnion]); -+ } else { -+ // We use a XUL html:span element so that the tooltiptext is displayed. -+ li([ -+ "html:span", -+ { -+ class: "circuit-onion", -+ onclick: ` +- "data-onion": domain, +- "data-text-clicktocopy": torbutton_get_property_string( +- "torbutton.circuit_display.click_to_copy" +- ), +- "data-text-copied": torbutton_get_property_string( +- "torbutton.circuit_display.copied" +- ), +- tooltiptext: domain, +- }, +- ...domainParts, +- ]); ++ if (mappedOnion) { ++ li(domain, " ", ["span", { class: "circuit-ip-address" }, mappedOnion]); ++ } else { ++ // We use a XUL html:span element so that the tooltiptext is displayed. ++ li([ ++ "html:span", ++ { ++ class: "circuit-onion", ++ onclick: ` + this.classList.add("circuit-onion-copied"); + Cc[ + "@mozilla.org/widget/clipboardhelper;1" + ].getService(Ci.nsIClipboardHelper).copyString(this.getAttribute("data-onion")) + `, -+ "data-onion": domain, -+ "data-text-clicktocopy": torbutton_get_property_string("torbutton.circuit_display.click_to_copy"), -+ "data-text-copied": torbutton_get_property_string("torbutton.circuit_display.copied"), -+ tooltiptext: domain, -+ }, -+ ...domainParts, -+ ]); -+ } ++ "data-onion": domain, ++ "data-text-clicktocopy": torbutton_get_property_string( ++ "torbutton.circuit_display.click_to_copy" ++ ), ++ "data-text-copied": torbutton_get_property_string( ++ "torbutton.circuit_display.copied" ++ ), ++ tooltiptext: domain, ++ }, ++ ...domainParts, ++ ]); ++ } - // Hide the note about guards if we are using a bridge. - document.getElementById("circuit-guard-note-container").style.display = -@@ -454,6 +495,7 @@ let setupDisplay = function (enablePrefName) { + // Hide the note about guards if we are using a bridge. + document.getElementById("circuit-guard-note-container").style.display = +@@ -534,6 +575,7 @@ let createTorCircuitDisplay = (function() { stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, stopEnsuringCorrectPopupDimensions = null, @@ -126,7 +134,7 @@ index d6034384..120d32a0 100644 stop = function() { syncDisplayWithSelectedTab(false); if (myController) { -@@ -466,6 +508,9 @@ let setupDisplay = function (enablePrefName) { +@@ -546,6 +588,9 @@ let createTorCircuitDisplay = (function() { if (stopEnsuringCorrectPopupDimensions) { stopEnsuringCorrectPopupDimensions(); } @@ -136,11 +144,11 @@ index d6034384..120d32a0 100644 myController = null; } }, -@@ -474,6 +519,7 @@ let setupDisplay = function (enablePrefName) { +@@ -554,6 +599,7 @@ let createTorCircuitDisplay = (function() { try { myController = await wait_for_controller(); syncDisplayWithSelectedTab(true); + stopCollectingBitTargets = collectBitTargets(myController); - stopCollectingIsolationData = collectIsolationData(myController, updateCircuitDisplay); - stopCollectingBrowserCredentials = collectBrowserCredentials(); - stopEnsuringCorrectPopupDimensions = ensureCorrectPopupDimensions(); + stopCollectingIsolationData = collectIsolationData( + myController, + updateCircuitDisplay -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.2.0esr-12.0-3 updated (e0f233e13cfdd -> accd3b2dd8810)
by gitolite role 07 Sep '22

07 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser. from e0f233e13cfdd Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser new c262b01adda91 fixup! Bug 40926: Implemented the New Identity feature new 37fccdc693a6a fixup! Bug 40926: Implemented the New Identity feature new f4f6ac34841de fixup! Bug 10760: Integrate TorButton to TorBrowser core new accd3b2dd8810 fixup! Bug 10760: Integrate TorButton to TorBrowser core The 4 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: browser/base/content/appmenu-viewcache.inc.xhtml | 6 +++--- browser/components/newidentity/content/newidentity.js | 11 ++--------- 2 files changed, 5 insertions(+), 12 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 4

[builders/tor-browser-build] annotated tag tbb-12.0a2-build2 created (now 41f858d)
by gitolite role 06 Sep '22

06 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tbb-12.0a2-build2 in repository builders/tor-browser-build. at 41f858d (tag) tagging 77a667a8c67c80e1282561675f8d77cef60dc439 (commit) replaces tbb-12.0a2-build1 by Richard Pospesel on Tue Sep 6 18:52:24 2022 +0000 - Log ----------------------------------------------------------------- Tagging build2 for 12.0a2 -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmMXlugXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSyx8xg/+LguWOsyjln+4wpZ1FV0gP1Kc JZgz2ShstpXd0hstOImn/yFj4+2yZgkz2xfMRav6s4JOl+dAOpw0KrzKu8QS+HgU 1mNpkCcHLjcswrJzpH1Jl4X/lcbSr9Rxy1ucz5HeLfjKA1qg61jKsgBzzyYOjvAJ X+YzCQ+eltJOiQmm3wcn9hEdAbNsIwFLTtybN+t+oqdvQGSf/cX7UzmF/kq4VCx0 +e8eI57rAcUPP2QDMw4Nj+3H5kE9U4cQA+LZCRtHGDMlqCjIi8ohi/YthFsrRRQq x2u5zskM6/XEXHm1YletG1uepSgH+XI+XSo/AHp8ChXWAZA1XFtdxnzS9trhnqBf M/rrCalHrlw24cF2PbXOdVK9uFRYf3TB+V9+KO5k6wfM0FPNhofcOClX39e5QTnI SLxh6Zi9NTA0VhiV6IycurgL/8JwsBEqRImVmT4tHqTggHp1EoFYJ25Z3A1x+czE 2mAOMLrNT/qzw4FZ2NXAE0NAyeKWATmXAS/3jGwNmSLXX9GlYmy8SXXaygnc6A7E /cq501/296Gz6B6mAjx4o78vIhPapmnIKVvBupVLAPuEYWb9Gp+Zb8ak1QWoLI4D TspYrlyDvrImAYtNbb7DszvODoK5TdsPvCayvkSEjYy6kVg8ngcaP3V5Q4Iphls2 86XXvnHPdKeoPnZRGAA= =Q+AR -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated: fixup! Bug 40589: Prepare alpha release 12.0a2 (Desktop+Android)
by gitolite role 06 Sep '22

06 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a commit to branch main in repository builders/tor-browser-build. The following commit(s) were added to refs/heads/main by this push: new 77a667a fixup! Bug 40589: Prepare alpha release 12.0a2 (Desktop+Android) 77a667a is described below commit 77a667a8c67c80e1282561675f8d77cef60dc439 Author: Richard Pospesel <richard(a)torproject.org> AuthorDate: Tue Sep 6 18:10:45 2022 +0000 fixup! Bug 40589: Prepare alpha release 12.0a2 (Desktop+Android) Fixed Windows build break --- projects/firefox/config | 2 +- rbm.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/projects/firefox/config b/projects/firefox/config index ec4b340..0e0f66b 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -12,7 +12,7 @@ container: var: firefox_platform_version: 102.2.0 firefox_version: '[% c("var/firefox_platform_version") %]esr' - browser_branch: '12.0-2' + browser_branch: '12.0-3' browser_build: 1 branding_directory: 'browser/branding/alpha' copyright_year: '[% exec("git show -s --format=%ci").remove("-.*") %]' diff --git a/rbm.conf b/rbm.conf index aa3a17f..1107a6d 100644 --- a/rbm.conf +++ b/rbm.conf @@ -72,7 +72,7 @@ buildconf: var: torbrowser_version: '12.0a2' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 12.0a1 multi_lingual: 0 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] annotated tag tor-browser-102.2.0esr-12.0-3-build1 created (now ff9eab7401890)
by gitolite role 06 Sep '22

06 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tor-browser-102.2.0esr-12.0-3-build1 in repository tor-browser. at ff9eab7401890 (tag) tagging e0f233e13cfdd2350569ba94cd00d40aebe3e9d8 (commit) replaces FIREFOX_102_2_0esr_BUILD2 by Richard Pospesel on Tue Sep 6 18:06:12 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 102.2esr-based alpha -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmMXjLwXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSywPxg/9Fo34zHhefiiJJ8bzX73TsAL3 oZkEcMUO4SMV5O496N9lPCxQLW+X9o6aEStp+3s2pyIwbJNc6vVJiz2w/T2ExDjH 6MFkvKrHxc21V7yVJS51hnbCkRr/kiBZzTpyyNq1cvuL5+mf5CAj6WfL9kRt9h5f kPQcicwcK/xQZxk63s+MaEDARs6xVsr3YVRJ0QibxXgcSYFguhdKVpsjZLcMRPac xjsN2EswABqXAKqbUTdJtw9yQRRjR0VTvUU+Z8k07ehcppYD8V3LqpJl5vQCpQjD CmOD5qyR+BgaeGU41exO+6Smdu0M8p80HDwVLUeoqMZvfn6VP6XLv0rzYPSAnHcc otMCzftwb9tc3EtrWtKKdfsTAWqQQb4JJ2UY7I7jh2hJF15FBoSqDJ272llMTwcB 4AZXNSJy7aMM0hdI46XqHUxlBKm3wn/5fZ3aUs6Pw6B8xsYTIzCTVUY5xc29U/zF zq/CC7BDaTYHVm2zsvSrGnXZhy2ug5+Px/ePEL8MpZrzeGmWabPbkGC7i+vD3wyZ dCVMxIyCgez95/dSATkWRWJuReVqW25y14X4asAEvz1Td1x6y6Zijd4AKZMki0AF JEEbUPTQFd4lK9T49NR9+NR2ZHK0HWmPutKIX8iKM/DAm6eqsYkPUFjVd7APq4G5 IqeFFFb/o+SV2w232cU= =tXhs -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor-browser] branch tor-browser-102.2.0esr-12.0-3 created (now e0f233e13cfdd)
by gitolite role 06 Sep '22

06 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch tor-browser-102.2.0esr-12.0-3 in repository tor-browser. at e0f233e13cfdd Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser This branch includes the following new commits: new 0dd67c2ba312e fixup! Bug 1761389 - Add and use new PDF-specific document icon on Windows. r=bhearsum new fde438b1d16ef Bug 40857: Modified the fat .aar creation file new 4829e9a126366 Adding issue template for bugs. new 33c64ecfb8afa Base Browser's .mozconfigs. new b84a62e94e888 Bug 41108: Remove privileged macOS installation from 102 new c0a505c4c2346 Bug 24796: Comment out excess permissions from GeckoView new a444f090565c4 Bug 25741: TBA: Disable GeckoNetworkManager new e2d098e3d6962 Bug 28125: Prevent non-Necko network connections new 49721fd6be02e Bug 12974: Disable NTLM and Negotiate HTTP Auth new 3491361bbdd21 Bug 40166: Disable security.certerrors.mitm.auto_enable_enterprise_roots new da2dda7b09ba8 Bug 16285: Exclude ClearKey system for now new fa73c7144947a Bug 21431: Clean-up system extensions shipped in Firefox new f367cc9b3c661 Bug 33852: Clean up about:logins (LockWise) to avoid mentioning sync, etc. new bd56723455486 Bug 40025: Remove Mozilla add-on install permissions new 9ffc2f69318dd Bug 40002: Remove about:ion new 0993ead451c36 Bug 26353: Prevent speculative connect that violated FPI. new a38e13857cb0d Bug 31740: Remove some unnecessary RemoteSettings instances new be26a18ea18ab Bug 30541: Disable WebGL readPixel() for web content new 4a5771a7e4685 Bug 28369: Stop shipping pingsender executable new cf26095e3d283 Bug 40073: Disable remote Public Suffix List fetching new bb96be9a1c1fe Firefox preference overrides. new f284abf4cd639 Bug 41043: Hardcode the UI font on Linux new 3b43dcd27e1e1 Bug 30605: Honor privacy.spoof_english in Android new 402e7cdbfd401 Bug 40199: Avoid using system locale for intl.accept_languages in GeckoView new 3f0c248c08ed6 Bug 40171: Make WebRequest and GeckoWebExecutor First-Party aware new e62be158590a0 Bug 26345: Hide tracking protection UI new 0d10348e8dae8 Bug 9173: Change the default Firefox profile directory to be relative. new 9bae4b546fa44 Bug 18800: Remove localhost DNS lookup in nsProfileLock.cpp new 7b381db8d63ea Bug 27604: Fix addon issues when moving the profile directory new 08472823fe5db Bug 13028: Prevent potential proxy bypass cases. new 38e35b684d777 Bug 11641: Disable remoting by default. new 0999f3916fea1 Bug 21830: Copying large text from web console leaks to /tmp new 2a7debab8d43b Bug 23104: Add a default line height compensation new 915fb9fae7733 Bug 40309: Avoid using regional OS locales new 4d7e016db2ef7 Bug 40432: Prevent probing installed applications new 8ac38d49ff850 Bug 32220: Improve the letterboxing experience new 1688d95d65f16 Bug 40069: Add helpers for message passing with extensions new eaa32ace95f8d Bug 40253: Explicitly allow NoScript in Private Browsing mode. new e854af2cb6f3f Bug 40925: Implemented the Security Level component new 0ee4408a71de7 Bug 40926: Implemented the New Identity feature new f382eeed51076 Bug 41089: Add tor-browser build scripts + Makefile to tor-browser new cbf6a86a1685f Bug 2176: Rebrand Firefox to TorBrowser new 6d450f934f02c Bring back old Firefox onboarding new 5aa11800cb3e4 Bug 26961: New user onboarding. new ad082239f5492 TB3: Tor Browser's official .mozconfigs. new 769e709c04ae2 Bug 40562: Added Tor-related preferences to 000-tor-browser.js new affde91732fcc Bug 13252: Do not store data in the app bundle new 05679bd761fae Bug 40597: Implement TorSettings module new 4a7532b3f81b5 Bug 10760: Integrate TorButton to TorBrowser core new e674b50b4bee3 Bug 28044: Integrate Tor Launcher into tor-browser new e6558532e57f5 Orfox: Centralized proxy applied to AbstractCommunicator and BaseResources. new 6a9d15bdc7ae5 Add TorStrings module for localization new a5b134cbc7a36 Bug 14631: Improve profile access error messages. new 530ec16438ad9 Bug 40209: Implement Basic Crypto Safety new e0f556c8251c0 Bug 19273: Avoid JavaScript patching of the external app helper dialog. new 26d034a32bb5e Bug 40807: Added QRCode.js to toolkit/modules new b2e3293f8a8d0 Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection new 9a429ced6e033 Bug 27476: Implement about:torconnect captive portal within Tor Browser new 750c27b24b64b Bug 12620: TorBrowser regression tests new a9fbfe1771a8d Bug 4234: Use the Firefox Update Process for Tor Browser. new 5f75c8cf832ae Bug 13379: Sign our MAR files. new f0b8a516129d8 Bug 16940: After update, load local change notes. new 8663d7bac2bac Bug 32658: Create a new MAR signing key new 4d27bf72fbed8 Omnibox: Add DDG, Startpage, Disconnect, Youtube, Twitter; remove Amazon, eBay, bing new 9480387780349 Bug 23247: Communicating security expectations for .onion new f9592704e86de Bug 30237: Add v3 onion services client authentication prompt new 9b9add4ea0740 Bug 21952: Implement Onion-Location new 0a4e307a687d2 Bug 40458: Implement .tor.onion aliases new e0f233e13cfdd Bug 11698: Incorporate Tor Browser Manual pages into Tor Browser The 69 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 69

[builders/tor-browser-build] annotated tag tbb-12.0a2-build1 created (now b168185)
by gitolite role 06 Sep '22

06 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to annotated tag tbb-12.0a2-build1 in repository builders/tor-browser-build. at b168185 (tag) tagging 73d6289f5ba0c399e41780ed8d6e2ac6bcf4c36d (commit) replaces tbb-12.0a1-build1 by Richard Pospesel on Tue Sep 6 15:34:11 2022 +0000 - Log ----------------------------------------------------------------- Tagging build1 for 12.0a2 -----BEGIN PGP SIGNATURE----- iQJLBAABCAA1FiEEvnyRTMkiztnZPSO33kc2A2PzSywFAmMXaHMXHHJpY2hhcmRA dG9ycHJvamVjdC5vcmcACgkQ3kc2A2PzSyxnwxAAmFh99mY7NJvRQV8v47snBn0y RoTbRxHqRixPw13FYZ5AixG3bs2dwQljc4a3US/MF7hi4uXdrtTGuohkNXQdeOi0 zrPdzTWEzRu12PlvF0CrA+qYBle4ZcBEAz8D/hBix9Q1M86UkTTd1zLyTxFwq0tU pBWZDLbxm0Fzp4rmUnEL6q9yjbXPsqWT/wMyhsR6BblzSVdTWRIr//9qs/z4tOPl mc7UqeCuGmZKpP7U7eu5QdF3pLceWOaS+vQFrwJfWigiluPMUX2OYY0d/7L8EpQt KwC4G0PIZLT5ew2s0tSFvzdPF5w3Nxz+Ff7GbuNE11xdCyF6a98SKpQPp46LQj8e oUP06Wh+ZQawKql+6X944akEcHDrrcCFQfPvITcR1vcifW8GKvbi4KbOBEKr6Avi FsQTZAdm3LH4DI10r9uSINN8AFBL+p8Qp77e3ajCR9NLfrj26hjtGM4GR0WsJKu9 VyComsgwhzHhDmuzmMcMjIVvPhKd+PJ59cDidFjDttlBM7fLaBl7L9QjXpAqAGEx GUThfR8yMSlsMXQ/vUQAxRE6h2bvusPu8gH6mKGRXec2vAdQ5RUpePxevQG6N0/P Gl+zQtQLEUJ8M31MH4h59XlMgPaiXcl6uof9EhChk232fYEdyGcKFu1NxvUqjRgU ovLR8xmkcDtfR+pZBY4= =oSsM -----END PGP SIGNATURE----- ----------------------------------------------------------------------- No new revisions were added by this update. -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[builders/tor-browser-build] branch main updated (14e0748 -> 73d6289)
by gitolite role 06 Sep '22

06 Sep '22

This is an automated email from the git hooks/post-receive script. richard pushed a change to branch main in repository builders/tor-browser-build. from 14e0748 Bug 40620: Update macosx-sdk to 11.0 new a848d2e Revert "Bug 41152: Do not merge libc++ and libunwind" new 5525b87 fixup! Bug 40595: Update config and toolchains for 102 new 73d6289 Bug 40589: Prepare alpha release 12.0a2 (Desktop+Android) The 3 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: projects/android-components/config | 2 +- projects/browser/Bundle-Data/Docs/ChangeLog.txt | 75 ++++++++ projects/browser/allowed_addons.json | 219 ++++++++++++------------ projects/browser/config | 4 +- projects/fenix/config | 2 +- projects/firefox/config | 2 +- projects/geckoview/config | 4 +- projects/go/config | 4 +- projects/manual/config | 4 +- projects/mingw-w64-clang/build | 18 ++ projects/mingw-w64/build | 2 +- projects/tba-translation/config | 2 +- projects/tor-launcher/config | 2 +- projects/tor/config | 2 +- projects/translation-base-browser/config | 2 +- rbm.conf | 4 +- 16 files changed, 218 insertions(+), 130 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3