- tor-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

[bridgedb] branch main updated (f07614a -> ba694e1)
by gitolite role 08 Sep '22

08 Sep '22

This is an automated email from the git hooks/post-receive script. meskio pushed a change to branch main in repository bridgedb. from f07614a Merge branch 'mr/48' new ef6d3d1 Fix missing assets on info, maintenance, howto pages new f4a5ae7 Add missing padding on main new ba694e1 Merge remote-tracking branch 'gitlab/mr/50' 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: bridgedb/distributors/https/templates/base.html | 14 +++++++------- frontend/assets/scss/_bridges.scss | 4 ++++ 2 files changed, 11 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[pluggable-transports/obfs4] annotated tag obfs4proxy-0.0.14 created (now 38e6edc)
by gitolite role 08 Sep '22

08 Sep '22

This is an automated email from the git hooks/post-receive script. meskio pushed a change to annotated tag obfs4proxy-0.0.14 in repository pluggable-transports/obfs4. at 38e6edc (tag) tagging 336a71d6e4cfd2d33e9c57797828007ad74975e9 (commit) replaces obfs4proxy-0.0.13 by Yawning Angel on Sun Sep 4 06:43:27 2022 +0000 - Log ----------------------------------------------------------------- tag 0.0.14 -----BEGIN PGP SIGNATURE----- iQJMBAABCgA2FiEE+5EpZj0U8MGetRiJsyQJr5QXcTkFAmMUSQ8YHHlhd25pbmdA c2Nod2FuZW5saWVkLm1lAAoJELMkCa+UF3E5tG8P/R8PrygkK7B5ZKdzGNTuOnYT fuqj6+Dds/p/Z+Gwpyg0JgwSG43x2ylmhNrw4Q8+HcnQI+cnQFCTb0pkKWlQTLkC pe94PUAis74jOm+rhYuzA4iVA5V474FSvoo5pyMOMnlIIPTxHloQrTRTG/T4x2OV 1i22tyTQl+RIanjXRlMBktVmyon49gruW3rxkH6gaaGLq2z4JnGHIroyprKFa6sd MOii6iHT05O5KTP2KFDLEmMSY+zmPsKqDMVoTi6e/rhnU8OrFaXRd1BuYJsSqDRp yHyShbskyjFfdmQvMX+Mnn4gkJAQwyx9TLhVPmXMCkB68B8w0818+o3Jg9EQ/fIg +fKjBbW1YdjhKxavQGAC4MidZ7CA3cHxcRspKi8JHDIhiW+7kcSwHcJr+3MulR8B FsrZNfSzpuAIm4cDlOP8LjE2Rxbhy9zgJnCitwl8M1CZ+pZtRoSR2eqyYq8D0xDD TNODnyKYmhNVrGgoDZsfomSkrxmAoYI1514fFcl2hJG3tp1vt3DFbR3Ug6yUOdNB 5Ap224tqgHAzzMENa6ZR9pWQr5WjKxg7gXGISBc0dTL47SCwiD5xyXqdBc7ncvAF OYxOoG3U75m7m+iYRtBT2wmZY+dfd/+Lz5jBQogdECXrV/dV6BEeSFkTdNkXgYkQ LGN1pieoEqIg2Riyiltx =TdQ7 -----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

[pluggable-transports/obfs4] annotated tag obfs4proxy-0.0.13 created (now 7d67b14)
by gitolite role 08 Sep '22

08 Sep '22

This is an automated email from the git hooks/post-receive script. meskio pushed a change to annotated tag obfs4proxy-0.0.13 in repository pluggable-transports/obfs4. at 7d67b14 (tag) tagging 77af0cba934d73c4baeb709560bcfc9a9fbc661c (commit) replaces obfs4proxy-0.0.12 by Yawning Angel on Fri Feb 4 00:39:07 2022 +0000 - Log ----------------------------------------------------------------- tag 0.0.13 -----BEGIN PGP SIGNATURE----- iQJMBAABCgA2FiEE+5EpZj0U8MGetRiJsyQJr5QXcTkFAmH8dasYHHlhd25pbmdA c2Nod2FuZW5saWVkLm1lAAoJELMkCa+UF3E5gQMQAJKLrYzhLtWycJoDaCSmGXHu Xqaj13ZERKaFoxn1/OhkSPY5dDi83Om9yWCk0GsXVjhxmD5VHyUpVRJBAUKS1e2u pwbMA4NkxWLqeeJ33b/rPQ67ySTrFEodYK5z7xXW8TAjpP0wCy4i3qVn3+q9gsS5 ERPSqV0Uo8xadxLHPmOk0TEorxdqw80ElWSL6M5hM2faFbC3CEVH4UzqZuh+T/2z 8THHy4ggaLjneu7YOWFYIWjBHVrACC9zOrxWV3wh66zNXGOyHsk28bQNRyF+AD6N CGKTsj7TFhSduitIyT8ief/DlkNAg/pVsAngwNHeZu119YbYQVjzhusi+NCWBsdU aQLrngQvPMQU3/Qcw9vb1UI2lsX15/0bbE5hDN3wCAyFwRcLJN1XSxw8zm8iDWR3 aXxgTENjU9IWM+LBu5PxRQpcsJMmHwC1wmSqzSmMu60oRZ6Gsieflcq9yYAdHUTX PekhxBaW9IwvfXV6DQpy7q5eC+t/xZ7uUIY9Jb/6HO5aDZ2aoYFPMDfGkbrdagD+ IgVr7Nruh4Ma0oOu7ssRPnskc29M4q57BDeZxf4Mv2ETmAdr8UOktSSouHYEtrfm tq2cnKLWKD/EPtw35raoUGjrVx12wVZip9rZ8Flb3Rk3x96iQPvmqhrXHU1V901f L4eZxNvg1HsZdNzY+Hjk =YEuu -----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

[pluggable-transports/obfs4] annotated tag obfs4proxy-0.0.12 created (now da33c54)
by gitolite role 08 Sep '22

08 Sep '22

This is an automated email from the git hooks/post-receive script. meskio pushed a change to annotated tag obfs4proxy-0.0.12 in repository pluggable-transports/obfs4. at da33c54 (tag) tagging a564bc3840bc788605e1a8155f4b95ce0d70c6db (commit) replaces obfs4proxy-0.0.11 by Yawning Angel on Fri Dec 31 02:45:54 2021 +0000 - Log ----------------------------------------------------------------- tag 0.0.12 -----BEGIN PGP SIGNATURE----- iQJMBAABCgA2FiEE+5EpZj0U8MGetRiJsyQJr5QXcTkFAmHObuIYHHlhd25pbmdA c2Nod2FuZW5saWVkLm1lAAoJELMkCa+UF3E5bH0P/jCWWjFlsVVlo8Wy0ArWHmLb QW33yLsxajjzul07W3LbGXb8AywUMQ8/LZDbcZWWP+MuN80yD6JWiBr/ffOl/pHU 7TkqMZbVfzGb/fzrjWm0puGyqUV6kFrODkjGmiSfk1AjHGySzEG+XS1EHktWlZUB CaAmLisFaHTU9PNNEb7TWzgWL96fMC+t8KCrxAM3ZLQqtBuahyg4IiihcJpKUat5 70BDh8Wx8tuVreKCFmQzgFOuS9G+5N22U+TkfdgKacc3JbVvgey1Wp0q4sA0vxVk ZVGli8nS8jyLnIcLJ65Cu4DLoriY25AFRp7sP5CuiFBlnT6klmykokySbn1Aa7Rp 9OIK9rh5p9Qt2/SNwio++1yMMIVSgN3ju2zvjSRsbK4iHJ5ZYf2RlOJ7bBaJR9O1 TyG+Q9mrJvIRM9wTzqH0oy4U8gG3W90Ha1JgaDSVRgBwMnDIqkhPo4qO2NeB+hjI 4c85pf6kAeerLFdHRW48NZ6aT2Ov+gK9s8QH2APv1PSfTZhFhUkSDjeZk75So1us kDnW/AeQnHIBSY0Xvq6Zbo1cl1cJcoMcaloMgptbH/y9pHlaVM04IvEKaI0jCjmA c7CSaqypvTzDWfynoiAkbzPnpMNdiLbSGH0PJowl90ytvZos1GsEj9WLmb60QQaJ H2SVz+T+fQOR6h1Bz//6 =C2xJ -----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

[pluggable-transports/obfs4] branch master updated (cbf3f3c -> 336a71d)
by gitolite role 08 Sep '22

08 Sep '22

This is an automated email from the git hooks/post-receive script. meskio pushed a change to branch master in repository pluggable-transports/obfs4. from cbf3f3c Bump the version to 0.0.13-dev new d5a5161 doc: Correct why the obfs4 change is backward compatible (NFC) new 83f01d5 transports/meek_lite: Remove utls support new 77af0cb build: Do the release ritual for obfs4proxy-0.0.13 new f63befd build: Bump the version to 0.0.14-dev new 586fbf4 Test that public keys are not always on the prime-order subgroup. new 5fcbb0e Do not clamp the private key before Elligator inverse map. new ef83204 doc: Add a changelog entry and clarified a comment (NFC) new 336a71d build: Do the release ritual for obfs4proxy-0.0.14 The 8 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: ChangeLog | 8 +- common/ntor/ntor.go | 3 - common/ntor/ntor_test.go | 136 +++++++++++++++++++++ go.mod | 1 - go.sum | 17 --- internal/README.md | 7 +- internal/x25519ell2/x25519ell2.go | 4 + obfs4proxy/obfs4proxy.go | 2 +- transports/meeklite/base.go | 6 +- transports/meeklite/hpkp_lite.go | 124 ------------------- transports/meeklite/meek.go | 47 ++----- transports/meeklite/transport.go | 250 -------------------------------------- 12 files changed, 166 insertions(+), 439 deletions(-) delete mode 100644 transports/meeklite/hpkp_lite.go delete mode 100644 transports/meeklite/transport.go -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 8

[pluggable-transports/snowflake-webext] branch main updated: use hosted gitlab's git repo for translation submodule
by gitolite role 08 Sep '22

08 Sep '22

This is an automated email from the git hooks/post-receive script. shelikhoo pushed a commit to branch main in repository pluggable-transports/snowflake-webext. The following commit(s) were added to refs/heads/main by this push: new 5bf945f use hosted gitlab's git repo for translation submodule 5bf945f is described below commit 5bf945f21fa290c6ed8775247c2cc1bf0ad18e4d Author: Shelikhoo <xiaokangwang(a)outlook.com> AuthorDate: Wed Sep 7 17:19:01 2022 +0100 use hosted gitlab's git repo for translation submodule --- .gitmodules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitmodules b/.gitmodules index fe6b18b..d7d1cb2 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,4 +1,4 @@ [submodule "proxy/translation"] path = translation - url = https://git.torproject.org/translation.git + url = https://gitlab.torproject.org/tpo/translation.git branch = snowflakeaddon-messages.json_completed -- 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