April 2020 - tbb-commits - lists.torproject.org

[tor-browser-build/master] Merge remote-tracking branch 'JeremyRand/stem-1.8.0'
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit 026dd67289580ff00b31f6c7c26328a9d2ecefed Merge: 44a18de d84dcba Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:48:52 2020 +0200 Merge remote-tracking branch 'JeremyRand/stem-1.8.0' projects/stemns/config | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)

1 0

[tor-browser-build/master] Merge remote-tracking branch 'acat/33845_fix_patch'
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit ba31ac419a33126882c45c94923614a555e80284 Merge: 4b9ad6d d3a7505 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:42:25 2020 +0200 Merge remote-tracking branch 'acat/33845_fix_patch' projects/firefox/namecoin-torbutton.patch | 75 ++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 17 deletions(-)

1 0

[tor-browser-build/master] Bug 33845: Rebase namecoin torbutton patch
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit d3a750533fbc28e9e80cce5311bbf79a3f58db21 Author: Alex Catarineu <acat(a)torproject.org> Date: Wed Apr 8 21:33:14 2020 +0200 Bug 33845: Rebase namecoin torbutton patch --- projects/firefox/namecoin-torbutton.patch | 75 ++++++++++++++++++++++++------- 1 file changed, 58 insertions(+), 17 deletions(-) diff --git a/projects/firefox/namecoin-torbutton.patch b/projects/firefox/namecoin-torbutton.patch index 11cf7a1..5649ee6 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 5ecbe7d..f771150 100644 +index 119f6fca..477b0302 100644 --- a/chrome/content/tor-circuit-display.js +++ b/chrome/content/tor-circuit-display.js -@@ -49,7 +49,11 @@ let credentialsToNodeDataMap = new Map(), +@@ -48,7 +48,11 @@ let credentialsToNodeDataMap = new Map(), knownCircuitIDs = new Map(), // A mutable map that records the SOCKS credentials for the // latest channels for each browser + domain. @@ -15,7 +15,7 @@ index 5ecbe7d..f771150 100644 // __trimQuotes(s)__. // Removes quotation marks around a quoted string. -@@ -126,6 +130,28 @@ let getCircuitStatusByID = async function (aController, circuitID) { +@@ -132,6 +136,28 @@ let getCircuitStatusByID = async function (aController, circuitID) { return null; }; @@ -44,7 +44,7 @@ index 5ecbe7d..f771150 100644 // __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 -@@ -139,6 +165,15 @@ let collectIsolationData = function (aController, updateUI) { +@@ -145,6 +171,15 @@ let collectIsolationData = function (aController, updateUI) { "STREAM", streamEvent => streamEvent.StreamStatus === "SENTCONNECT", async (streamEvent) => { @@ -52,7 +52,7 @@ index 5ecbe7d..f771150 100644 + // 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")) { ++ if (targetDomain.endsWith(".onion")) { + bitToOnionMap[bitTargets[streamEvent.StreamID]] = targetDomain; + logger.eclog(3, "mapped " + bitTargets[streamEvent.StreamID] + " to " + targetDomain); + } @@ -60,10 +60,10 @@ index 5ecbe7d..f771150 100644 if (!knownCircuitIDs.get(streamEvent.CircuitID)) { logger.eclog(3, "streamEvent.CircuitID: " + streamEvent.CircuitID); knownCircuitIDs.set(streamEvent.CircuitID, true); -@@ -306,12 +341,14 @@ let updateCircuitDisplay = function () { - (i === 0 && nodeData[0].type !== "bridge") ? - ["span", { class: "circuit-guard-info" }, uiString("guard")] : null); +@@ -312,7 +347,9 @@ let updateCircuitDisplay = function () { } + + let domainParts = []; - if (domain.endsWith(".onion")) { + logger.eclog(3, "bit to onion map:" + JSON.stringify(bitToOnionMap) + ", domain: " + domain); + let mappedOnion = bitToOnionMap[domain]; @@ -71,13 +71,54 @@ index 5ecbe7d..f771150 100644 for (let i = 0; i < 3; ++i) { li(uiString("relay")); } +@@ -325,24 +362,28 @@ let updateCircuitDisplay = function () { + domainParts.push(domain); } -- li(domain); -+ li(domain, " ", mappedOnion ? ["span", { class: "circuit-ip-address" }, mappedOnion] : null); + +- // 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: ` ++ 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, ++ ]); ++ } + // Hide the note about guards if we are using a bridge. document.getElementById("circuit-guard-note-container").style.display = - (nodeData[0].type === "bridge") ? "none" : "block"; -@@ -418,6 +455,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -450,6 +491,7 @@ let setupDisplay = function (enablePrefName) { stopCollectingIsolationData = null, stopCollectingBrowserCredentials = null, stopEnsuringCorrectPopupDimensions = null, @@ -85,17 +126,17 @@ index 5ecbe7d..f771150 100644 stop = function() { syncDisplayWithSelectedTab(false); if (myController) { -@@ -430,6 +468,9 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -462,6 +504,9 @@ let setupDisplay = function (enablePrefName) { if (stopEnsuringCorrectPopupDimensions) { stopEnsuringCorrectPopupDimensions(); } -+ if (stopCollectingBitTargets) { -+ stopCollectingBitTargets(); -+ } ++ if (stopCollectingBitTargets) { ++ stopCollectingBitTargets(); ++ } myController = null; } }, -@@ -444,6 +485,7 @@ let setupDisplay = function (ipcFile, host, port, password, enablePrefName) { +@@ -475,6 +520,7 @@ let setupDisplay = function (enablePrefName) { stop(); }); syncDisplayWithSelectedTab(true);

1 0

[tor-browser-build/master] Revert "Bug 33845: Disable Namecoin on nightly temporarily"
by boklm＠torproject.org 09 Apr '20

09 Apr '20

commit 44a18de3b88d80f6841e21903896a5f957ca8e63 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Thu Apr 9 22:42:48 2020 +0200 Revert "Bug 33845: Disable Namecoin on nightly temporarily" This reverts commit 4b9ad6d76f322fc83b9e8fb5751b95662a0b85ce. --- rbm.conf | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rbm.conf b/rbm.conf index a59aacb..a988c89 100644 --- a/rbm.conf +++ b/rbm.conf @@ -299,8 +299,7 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' # Only build Namecoin for linux on nightly - # Namecoin is temporarily disabled on nightly until #33845 is fixed. - namecoin: 0 + namecoin: '[% c("var/nightly") %]' container: suite: wheezy arch: amd64

1 0

[tor-browser-build/master] Bug 33845: Disable Namecoin on nightly temporarily
by boklm＠torproject.org 08 Apr '20

08 Apr '20

commit 4b9ad6d76f322fc83b9e8fb5751b95662a0b85ce Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 8 17:22:20 2020 +0200 Bug 33845: Disable Namecoin on nightly temporarily Namecoin support is temporarily disabled, until projects/firefox/namecoin-torbutton.patch is rebased. --- rbm.conf | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rbm.conf b/rbm.conf index a988c89..a59aacb 100644 --- a/rbm.conf +++ b/rbm.conf @@ -299,7 +299,8 @@ targets: # channels for now. snowflake: '[% c("var/alpha") || c("var/nightly") %]' # Only build Namecoin for linux on nightly - namecoin: '[% c("var/nightly") %]' + # Namecoin is temporarily disabled on nightly until #33845 is fixed. + namecoin: 0 container: suite: wheezy arch: amd64

1 0

[tor-browser-build/master] Merge remote-tracking branch 'boklmtpo/bug_33807_v2'
by sysrqb＠torproject.org 07 Apr '20

07 Apr '20

commit 5a2948b7195d1daa2b73b3cef2ed5507a922a76e Merge: 54fd8bc 65a1aca Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Tue Apr 7 01:33:42 2020 +0000 Merge remote-tracking branch 'boklmtpo/bug_33807_v2' projects/firefox/namecoin-etld.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)

1 0

[tor-browser-build/master] Bug 33807: Rebase namecoin firefox patch
by sysrqb＠torproject.org 07 Apr '20

07 Apr '20

commit 65a1aca6a618016afd97ec4b956ba58014db9051 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Sun Apr 5 17:48:04 2020 +0200 Bug 33807: Rebase namecoin firefox patch --- projects/firefox/namecoin-etld.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/projects/firefox/namecoin-etld.patch b/projects/firefox/namecoin-etld.patch index 4a97f99..e2e49a5 100644 --- a/projects/firefox/namecoin-etld.patch +++ b/projects/firefox/namecoin-etld.patch @@ -1,5 +1,5 @@ diff --git a/mobile/android/app/src/main/assets/publicsuffixlist b/mobile/android/app/src/main/assets/publicsuffixlist -index 7f834b1..6874b40 100644 +index 7f834b1a89bd..6874b4005ae3 100644 --- a/mobile/android/app/src/main/assets/publicsuffixlist +++ b/mobile/android/app/src/main/assets/publicsuffixlist @@ -3005,6 +3005,8 @@ edu.mn @@ -12,13 +12,13 @@ index 7f834b1..6874b40 100644 vision eurovision diff --git a/netwerk/dns/effective_tld_names.dat b/netwerk/dns/effective_tld_names.dat -index 9dd962a..3402b20 100644 +index 0c53819d860d..469fb3d53ba1 100644 --- a/netwerk/dns/effective_tld_names.dat +++ b/netwerk/dns/effective_tld_names.dat -@@ -5480,6 +5480,7 @@ pro.om - - // onion : https://tools.ietf.org/html/rfc7686 +@@ -5497,6 +5497,7 @@ pro.om onion + tor.onion + securedrop.tor.onion +bit.onion // org : https://en.wikipedia.org/wiki/.org

1 0

[tor-browser-build/master] Fix #33821 and tag -build2
by sysrqb＠torproject.org 05 Apr '20

05 Apr '20

commit 54fd8bc84945088600e7f039e9a341db37697593 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Apr 5 22:45:02 2020 +0000 Fix #33821 and tag -build2 --- 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 02b1908..f03c110 100644 --- a/projects/firefox/config +++ b/projects/firefox/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: 'firefox-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %]' -git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build1' +git_hash: 'tor-browser-[% c("var/firefox_version") %]-[% c("var/torbrowser_branch") %]-1-build2' tag_gpg_id: 1 git_url: https://git.torproject.org/tor-browser.git git_submodule: 1 diff --git a/rbm.conf b/rbm.conf index 564dff4..a988c89 100644 --- a/rbm.conf +++ b/rbm.conf @@ -25,7 +25,7 @@ buildconf: var: torbrowser_version: '9.5a11' - torbrowser_build: 'build1' + torbrowser_build: 'build2' torbrowser_incremental_from: - 9.5a9 - 9.5a10

1 0

[tor-browser/tor-browser-68.7.0esr-9.5-1] fixup! Bug 28005: Implement .onion alias urlbar rewrites
by sysrqb＠torproject.org 05 Apr '20

05 Apr '20

commit e09b2deb216910b26f1ade5882d3c3c07af30652 Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Apr 5 22:34:53 2020 +0000 fixup! Bug 28005: Implement .onion alias urlbar rewrites --- browser/components/onionservices/moz.build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/browser/components/onionservices/moz.build b/browser/components/onionservices/moz.build index e4c63a6ebcb9..dfd664df434e 100644 --- a/browser/components/onionservices/moz.build +++ b/browser/components/onionservices/moz.build @@ -1,9 +1,9 @@ JAR_MANIFESTS += ['jar.mn'] EXTRA_JS_MODULES += [ - 'OnionLocationChild.jsm', - 'OnionLocationParent.jsm', 'ExtensionMessaging.jsm', 'HttpsEverywhereControl.jsm', 'OnionAliasStore.jsm', + 'OnionLocationChild.jsm', + 'OnionLocationParent.jsm', ]

1 0

[tor-browser-build/master] Revert "Bug 33630: Pick up tor-android-service patch"
by sysrqb＠torproject.org 05 Apr '20

05 Apr '20

commit 8c408b55345aec7af1be95d722e115df3f877beb Author: Matthew Finkel <sysrqb(a)torproject.org> Date: Sun Apr 5 15:51:50 2020 +0000 Revert "Bug 33630: Pick up tor-android-service patch" This reverts commit 3636417054f1e739a3a26bbacadbcd252c5a14c2. --- projects/tor-android-service/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/projects/tor-android-service/config b/projects/tor-android-service/config index 9754ebe..c2994b7 100644 --- a/projects/tor-android-service/config +++ b/projects/tor-android-service/config @@ -1,7 +1,7 @@ # vim: filetype=yaml sw=2 version: '[% c("abbrev") %]' filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %]' -git_hash: 2a7091dd16842b58bb4ae10dabfddae97c8e3a4a +git_hash: 18ba7d2780b1d5194cc5854d703655f6c9d3d196 git_url: https://git.torproject.org/tor-android-service.git git_submodule: 1

1 0