- tor-commits - lists.torproject.org

[tor] branch main updated (7fc474bd3f -> 5ce8b82edc)
by gitolite role 17 Jun '22

17 Jun '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from 7fc474bd3f Merge branch 'maint-0.4.7' new 223886c118 Update geoip files to match ipfire location db, 2022/06/17. new 9cab60183d fallbackdir: Update list generated on June 17, 2022 new edde188cf2 release: ChangeLog and ReleaseNotes for 0.4.7.8 new 7528524aee version: Bump version to 0.4.7.8 new 5ce8b82edc Merge branch 'maint-0.4.7' The 5 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: -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 5

[tor] branch release-0.4.7 updated (254ca6717f -> 5a25374209)
by gitolite role 17 Jun '22

17 Jun '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from 254ca6717f Changes file for Bug 40612 new b0496d4019 Fix for RTT calculation hang during congestion control. new 5a25374209 Add changes file for bug40626 The 2 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: changes/bug40626 | 6 ++++ src/core/or/congestion_control_common.c | 51 ++++++++++++++------------------- 2 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 changes/bug40626 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch maint-0.4.7 updated (254ca6717f -> 5a25374209)
by gitolite role 17 Jun '22

17 Jun '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch maint-0.4.7 in repository tor. from 254ca6717f Changes file for Bug 40612 new b0496d4019 Fix for RTT calculation hang during congestion control. new 5a25374209 Add changes file for bug40626 The 2 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: changes/bug40626 | 6 ++++ src/core/or/congestion_control_common.c | 51 ++++++++++++++------------------- 2 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 changes/bug40626 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch main updated (1d6470a2a8 -> 7fc474bd3f)
by gitolite role 17 Jun '22

17 Jun '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch main in repository tor. from 1d6470a2a8 Merge branch 'maint-0.4.7' new b0496d4019 Fix for RTT calculation hang during congestion control. new 5a25374209 Add changes file for bug40626 new 7fc474bd3f Merge branch 'maint-0.4.7' 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: changes/bug40626 | 6 ++++ src/core/or/congestion_control_common.c | 51 ++++++++++++++------------------- 2 files changed, 27 insertions(+), 30 deletions(-) create mode 100644 changes/bug40626 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 3

[tor-browser] branch tor-browser-91.10.0esr-11.5-1 updated: fixup! Bug 40458: Implement .tor.onion aliases
by gitolite role 17 Jun '22

17 Jun '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.10.0esr-11.5-1 by this push: new b99f714220a4c fixup! Bug 40458: Implement .tor.onion aliases b99f714220a4c is described below commit b99f714220a4cf0b6bb334eebb7d6c4eda8b582b Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Thu Jun 16 18:38:10 2022 +0200 fixup! Bug 40458: Implement .tor.onion aliases Bug 41032: OnionAliasStore.jsm is missing from the moz.build --- browser/components/onionservices/moz.build | 1 + 1 file changed, 1 insertion(+) diff --git a/browser/components/onionservices/moz.build b/browser/components/onionservices/moz.build index 27f9d2da4a9ea..8644548caa15d 100644 --- a/browser/components/onionservices/moz.build +++ b/browser/components/onionservices/moz.build @@ -1,6 +1,7 @@ JAR_MANIFESTS += ["jar.mn"] EXTRA_JS_MODULES += [ + "OnionAliasStore.jsm", "OnionLocationChild.jsm", "OnionLocationParent.jsm", ] -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake] branch main updated (97dea53 -> 35e9ab8)
by gitolite role 16 Jun '22

16 Jun '22

This is an automated email from the git hooks/post-receive script. shelikhoo pushed a change to branch main in repository pluggable-transports/snowflake. from 97dea53 Update Relay Pattern format to include dollar sign new 211254f Add distinct IP counter new fa7d1e2 Add distinct IP counter to metrics new 2541b13 Add distinct IP counter to broker new be40b62 Add go sum for hyperloglog new af11343 Update distinct counter interface new b18e6fc Add document for Distinct IP file new 35e9ab8 Use truncated hash instead crc64 for counted hash The 7 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: broker/broker.go | 17 ++++++++ broker/ipc.go | 1 + broker/metrics.go | 13 ++++++ common/ipsetsink/sink.go | 55 +++++++++++++++++++++++ common/ipsetsink/sink_test.go | 47 ++++++++++++++++++++ common/ipsetsink/sinkcluster/common.go | 24 ++++++++++ common/ipsetsink/sinkcluster/reader.go | 60 +++++++++++++++++++++++++ common/ipsetsink/sinkcluster/writer.go | 68 +++++++++++++++++++++++++++++ common/ipsetsink/sinkcluster/writer_test.go | 33 ++++++++++++++ distinctcounter/counter.go | 37 ++++++++++++++++ go.mod | 1 + go.sum | 2 + 12 files changed, 358 insertions(+) create mode 100644 common/ipsetsink/sink.go create mode 100644 common/ipsetsink/sink_test.go create mode 100644 common/ipsetsink/sinkcluster/common.go create mode 100644 common/ipsetsink/sinkcluster/reader.go create mode 100644 common/ipsetsink/sinkcluster/writer.go create mode 100644 common/ipsetsink/sinkcluster/writer_test.go create mode 100644 distinctcounter/counter.go -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 7

[pluggable-transports/snowflake-webext] branch main updated: Add Relay URL support to web proxy
by gitolite role 16 Jun '22

16 Jun '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 15768f5 Add Relay URL support to web proxy 15768f5 is described below commit 15768f50c0ddd68d3ffb815cd532ddbd3d85fd41 Author: Shelikhoo <xiaokangwang(a)outlook.com> AuthorDate: Fri May 20 16:37:14 2022 +0100 Add Relay URL support to web proxy --- broker.js | 3 ++- config.js | 2 ++ proxypair.js | 16 +++++++++++---- snowflake.js | 65 +++++++++++++++++++++++++++++++++++++++++++++++++----------- websocket.js | 26 +++++++++++++++++++++++- 5 files changed, 94 insertions(+), 18 deletions(-) diff --git a/broker.js b/broker.js index d83f03c..e993a48 100644 --- a/broker.js +++ b/broker.js @@ -67,11 +67,12 @@ class Broker { this._xhr = xhr; // Used by spec to fake async Broker interaction const clients = Math.floor(numClientsConnected / 8) * 8; var data = { - Version: "1.2", + Version: "1.3", Sid: id, Type: this.config.proxyType, NAT: this.natType, Clients: clients, + AcceptedRelayPattern: this.config.allowedRelayPattern, }; return this._postRequest(xhr, 'proxy', JSON.stringify(data)); }); diff --git a/config.js b/config.js index d05554c..cac8506 100644 --- a/config.js +++ b/config.js @@ -51,3 +51,5 @@ Config.prototype.pcConfig = { }; Config.PROBEURL = "https://snowflake-broker.freehaven.net:8443/probe"; + +Config.prototype.allowedRelayPattern="snowflake.torproject.net"; \ No newline at end of file diff --git a/proxypair.js b/proxypair.js index 169511b..1d9689e 100644 --- a/proxypair.js +++ b/proxypair.js @@ -24,6 +24,7 @@ class ProxyPair { this.onError = this.onError.bind(this); this.flush = this.flush.bind(this); + this.relayURL = undefined; this.relayAddr = relayAddr; this.rateLimit = rateLimit; this.config = config; @@ -82,14 +83,14 @@ class ProxyPair { channel.onclose = () => { log('WebRTC DataChannel closed.'); snowflake.ui.setStatus('disconnected by webrtc.'); - if(this.counted) { + if (this.counted) { snowflake.ui.decreaseClients(); this.counted = false; } this.flush(); return this.close(); }; - channel.onerror = function() { + channel.onerror = function () { return log('Data channel error!'); }; channel.binaryType = "arraybuffer"; @@ -112,7 +113,10 @@ class ProxyPair { if (peer_ip != null) { params.push(["client_ip", peer_ip]); } - var relay = this.relay = WS.makeWebsocket(this.relayAddr, params); + var relay = this.relay = + (this.relayURL === undefined) ? + WS.makeWebsocket(this.relayAddr, params) : + WS.makeWebsocketFromURL(this.relayURL, params); this.relay.label = 'websocket-relay'; this.relay.onopen = () => { if (this.timer) { @@ -125,7 +129,7 @@ class ProxyPair { this.relay.onclose = () => { log(relay.label + ' closed.'); snowflake.ui.setStatus('disconnected.'); - if(this.counted) { + if (this.counted) { snowflake.ui.decreaseClients(); this.counted = false; } @@ -248,6 +252,10 @@ class ProxyPair { return (null !== this.pc) && ('closed' !== this.pc.connectionState); } + setRelayURL(relayURL) { + this.relayURL = relayURL; + } + } ProxyPair.prototype.MAX_BUFFER = 10 * 1024 * 1024; diff --git a/snowflake.js b/snowflake.js index 03b0229..7370f01 100644 --- a/snowflake.js +++ b/snowflake.js @@ -68,12 +68,12 @@ class Snowflake { } this.ui.setStatus(msg); //update NAT type - console.log("NAT type: "+ this.ui.natType); + console.log("NAT type: " + this.ui.natType); this.broker.setNATType(this.ui.natType); recv = this.broker.getClientOffer(pair.id, this.proxyPairs.length); recv.then((resp) => { var clientNAT = resp.NAT; - if (!this.receiveOffer(pair, resp.Offer)) { + if (!this.receiveOffer(pair, resp.Offer, resp.RelayURL)) { return pair.close(); } //set a timeout for channel creation @@ -83,14 +83,14 @@ class Snowflake { pair.close(); // increase poll interval this.pollInterval = - Math.min(this.pollInterval + this.config.pollAdjustment, - this.config.slowestBrokerPollInterval); + Math.min(this.pollInterval + this.config.pollAdjustment, + this.config.slowestBrokerPollInterval); if (clientNAT == "restricted") { this.natFailures++; } // if we fail to connect to a restricted client 3 times in // a row, assume we have a restricted NAT - if (this.natFailures >= 3){ + if (this.natFailures >= 3) { this.ui.natType = "restricted"; console.log("Learned NAT type: restricted"); this.natFailures = 0; @@ -99,13 +99,13 @@ class Snowflake { } else { // decrease poll interval this.pollInterval = - Math.max(this.pollInterval - this.config.pollAdjustment, - this.config.defaultBrokerPollInterval); + Math.max(this.pollInterval - this.config.pollAdjustment, + this.config.defaultBrokerPollInterval); this.natFailures = 0; } return; }), this.config.datachannelTimeout); - }, function() { + }, function () { //on error, close proxy pair return pair.close(); }); @@ -114,9 +114,24 @@ class Snowflake { // Receive an SDP offer from some client assigned by the Broker, // |pair| - an available ProxyPair. - receiveOffer(pair, desc) { + receiveOffer(pair, desc, relayURL) { var e, offer, sdp; + try { + if (relayURL !== undefined) { + let relayURLParsed = new URL(relayURL); + let hostname = relayURLParsed.hostname; + let protocol = relayURLParsed.protocol; + if (protocol !== "wss:") { + log('incorrect relay url protocol'); + return false; + } + if (!this.checkRelayPattern(this.config.allowedRelayPattern, hostname)) { + log('relay url hostname does not match allowed pattern'); + return false; + } + pair.setRelayURL(relayURL); + } offer = JSON.parse(desc); dbg('Received:\n\n' + offer.sdp + '\n'); sdp = new RTCSessionDescription(offer); @@ -135,11 +150,11 @@ class Snowflake { sendAnswer(pair) { var fail, next; - next = function(sdp) { + next = function (sdp) { dbg('webrtc: Answer ready.'); return pair.pc.setLocalDescription(sdp).catch(fail); }; - fail = function() { + fail = function () { pair.close(); return dbg('webrtc: Failed to create or set Answer'); }; @@ -154,7 +169,7 @@ class Snowflake { pair = new ProxyPair(this.relayAddr, this.rateLimit, this.config); this.proxyPairs.push(pair); - log('Snowflake IDs: ' + (this.proxyPairs.map(function(p) { + log('Snowflake IDs: ' + (this.proxyPairs.map(function (p) { return p.id; })).join(' | ')); @@ -182,6 +197,32 @@ class Snowflake { return results; } + /** + * checkRelayPattern match str against patten + * @param {string} pattern + * @param {string} str typically a domain name to be checked + * @return {boolean} + */ + checkRelayPattern(pattern, str) { + if (typeof pattern !== "string") { + throw 'invalid checkRelayPattern input: pattern'; + } + if (typeof str !== "string") { + throw 'invalid checkRelayPattern input: str'; + } + + let exactMatch = false; + if (pattern.charAt(0) === "^") { + exactMatch = true; + pattern = pattern.substring(1); + } + + if (exactMatch) { + return pattern.localeCompare(str) === 0; + } + return str.endsWith(pattern); + } + } Snowflake.prototype.relayAddr = null; diff --git a/websocket.js b/websocket.js index da7ba94..fdf470c 100644 --- a/websocket.js +++ b/websocket.js @@ -27,7 +27,7 @@ class WS { if (!path.match(/^\//)) { path = '/' + path; } - path = path.replace(/[^/]+/, function(m) { + path = path.replace(/[^/]+/, function (m) { return encodeURIComponent(m); }); parts.push(path); @@ -54,6 +54,30 @@ class WS { return ws; } + /** + * Creates a websocket connection from a URL and params to override + * @param {URL|string} url + * @param {URLSearchParams|string[][]} params + * @return {WebSocket} + */ + static makeWebsocketFromURL(url, params) { + let parsedURL = new URL(url); + let urlpa = new URLSearchParams(params); + urlpa.forEach(function (value, key) { + parsedURL.searchParams.set(key, value); + }); + + let ws = new WebSocket(url); + /* + 'User agents can use this as a hint for how to handle incoming binary data: + if the attribute is set to 'blob', it is safe to spool it to disk, and if it + is set to 'arraybuffer', it is likely more efficient to keep the data in + memory.' + */ + ws.binaryType = 'arraybuffer'; + return ws; + } + static probeWebsocket(addr) { return new Promise((resolve, reject) => { const ws = WS.makeWebsocket(addr); -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[pluggable-transports/snowflake] branch main updated (f38c91f -> 97dea53)
by gitolite role 16 Jun '22

16 Jun '22

This is an automated email from the git hooks/post-receive script. shelikhoo pushed a change to branch main in repository pluggable-transports/snowflake. from f38c91f Don't use entropy for test new 3d4f294 Add Bridge List Definition new 0822c5f Add Bridge List Holder new 5578b4d Add Bridge List Holder Test new 38f0e00 Add Domain Name Matcher new 613ceaf Add RelayURL and AllowedRelayPattern to snowflake signaling new 863a829 Add RelayURL support in proxy new d5a87c3 Guard Proxy Relay URL Acceptance with Pattern Check new 5d7a376 Add Relay Info Forwarding for Snowflake new c7549d8 Update default snowflake server address new 50c0d64 Add Detailed Error Output for proxyPolls, proxyAnswers new c961b07 Add Detailed Error Output for datachannelHandler new 02c6f76 Add support for specifying bridge list file new b09a2e0 Add Relay URL Check in Snowflake Proxy new 2ebdc89 Add Allowed Relay Hostname Pattern Indication new b18a943 Add Broker Allowed Relay Pattern Indication Rejection for Proxy new 3ebb5a4 Show relay URL when connecting to relay new 6e8fbe5 Rejection reason feedback new 1b48ee1 Add test for proxy poll with Relay URL new b391d98 Add Proxy Relay URL Support Counting Metrics Output new 7caab01 Fixed desynchronized comment and behavior for log interval new b78eb74 Add Proxy Relay URL Rejection Metrics new dd61e2b Add Proxy Relay URL Metrics Collection new f789dce Represent Bridge Fingerprint As String new c5e5b45 Update message protocol version to 1.3 for RelayURL new 8ab4565 Disallow unknown bridge list file field new 8ba8917 Add document for LoadBridgeInfo input new a4bbb72 Fix not zero metrics for 1.3 values new 0ae4d82 Move ErrExtraInfo to ipc.go new e5b799d Update documents for broker messages new ddf7202 Restrict Allowed Relay to Tor Pool by default new 97dea53 Update Relay Pattern format to include dollar sign The 31 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: broker/bridge-list.go | 94 ++++++++++++++++ broker/bridge-list_test.go | 64 +++++++++++ broker/broker.go | 53 ++++++++- broker/http.go | 4 +- broker/ipc.go | 54 ++++++++- broker/metrics.go | 47 +++++++- broker/snowflake-broker_test.go | 17 ++- common/bridgefingerprint/fingerprint.go | 30 +++++ common/messages/client.go | 5 +- common/messages/ipc.go | 1 + common/messages/messages_test.go | 191 ++++++++++++++++++++------------ common/messages/proxy.go | 88 +++++++++++---- common/namematcher/matcher.go | 31 ++++++ common/namematcher/matcher_test.go | 55 +++++++++ doc/broker-spec.txt | 28 ++++- proxy/lib/proxy-go_test.go | 4 +- proxy/lib/snowflake.go | 67 ++++++++--- proxy/main.go | 5 + 18 files changed, 708 insertions(+), 130 deletions(-) create mode 100644 broker/bridge-list.go create mode 100644 broker/bridge-list_test.go create mode 100644 common/bridgefingerprint/fingerprint.go create mode 100644 common/namematcher/matcher.go create mode 100644 common/namematcher/matcher_test.go -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 31

[tor-browser] branch tor-browser-91.10.0esr-11.5-1 updated: fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection
by gitolite role 16 Jun '22

16 Jun '22

This is an automated email from the git hooks/post-receive script. pierov pushed a commit to branch tor-browser-91.10.0esr-11.5-1 in repository tor-browser. The following commit(s) were added to refs/heads/tor-browser-91.10.0esr-11.5-1 by this push: new 9e479455512e4 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection 9e479455512e4 is described below commit 9e479455512e432cbacbe9f722ebd58f72cc7484 Author: Pier Angelo Vendrame <pierov(a)torproject.org> AuthorDate: Thu Jun 16 15:04:37 2022 +0200 fixup! Bug 31286: Implementation of bridge, proxy, and firewall settings in about:preferences#connection Fixed text wrapping in modals --- .../torpreferences/content/builtinBridgeDialog.jsm | 32 ++-------------------- .../content/builtinBridgeDialog.xhtml | 26 +++++------------- .../torpreferences/content/connectionPane.js | 32 +++------------------- .../content/connectionSettingsDialog.xhtml | 16 +++++------ .../torpreferences/content/torPreferences.css | 12 +++++--- 5 files changed, 29 insertions(+), 89 deletions(-) diff --git a/browser/components/torpreferences/content/builtinBridgeDialog.jsm b/browser/components/torpreferences/content/builtinBridgeDialog.jsm index 1d4dda8f5ca9c..c03e83178f26c 100644 --- a/browser/components/torpreferences/content/builtinBridgeDialog.jsm +++ b/browser/components/torpreferences/content/builtinBridgeDialog.jsm @@ -14,7 +14,6 @@ class BuiltinBridgeDialog { constructor() { this._dialog = null; this._bridgeType = ""; - this._windowPadding = 0; } static get selectors() { @@ -36,14 +35,7 @@ class BuiltinBridgeDialog { this._dialog = aDialog; const dialogWin = this._dialog.parentElement; - { - dialogWin.setAttribute("title", TorStrings.settings.builtinBridgeTitle); - let windowStyle = window.getComputedStyle(dialogWin); - this._windowPadding = - parseFloat(windowStyle.paddingLeft) + - parseFloat(windowStyle.paddingRight); - } - const initialWidth = dialogWin.clientWidth - this._windowPadding; + dialogWin.setAttribute("title", TorStrings.settings.builtinBridgeTitle); this._dialog.querySelector(selectors.header).textContent = TorStrings.settings.builtinBridgeHeader; @@ -73,10 +65,10 @@ class BuiltinBridgeDialog { }; TorBuiltinBridgeTypes.forEach(type => { - types[type].elemRadio.parentElement.setAttribute("hidden", "false"); - types[type].elemDescr.parentElement.setAttribute("hidden", "false"); types[type].elemRadio.setAttribute("label", types[type].label); + types[type].elemRadio.setAttribute("hidden", "false"); types[type].elemDescr.textContent = types[type].descr; + types[type].elemDescr.removeAttribute("hidden"); }); if ( @@ -91,9 +83,6 @@ class BuiltinBridgeDialog { this._bridgeType = ""; } - // Use the initial width, because the window is expanded when we add texts - this.resized(initialWidth); - this._dialog.addEventListener("dialogaccept", e => { this._bridgeType = radioGroup.value; }); @@ -105,21 +94,6 @@ class BuiltinBridgeDialog { }); } - resized(width) { - if (this._dialog === null) { - return; - } - const dialogWin = this._dialog.parentElement; - if (width === undefined) { - width = dialogWin.clientWidth - this._windowPadding; - } - let windowPos = dialogWin.getBoundingClientRect(); - dialogWin.querySelectorAll("div").forEach(div => { - let divPos = div.getBoundingClientRect(); - div.style.width = width - (divPos.left - windowPos.left) + "px"; - }); - } - init(window, aDialog) { // defer to later until firefox has populated the dialog with all our elements window.setTimeout(() => { diff --git a/browser/components/torpreferences/content/builtinBridgeDialog.xhtml b/browser/components/torpreferences/content/builtinBridgeDialog.xhtml index c1bf202ca1be5..61c6110f327a7 100644 --- a/browser/components/torpreferences/content/builtinBridgeDialog.xhtml +++ b/browser/components/torpreferences/content/builtinBridgeDialog.xhtml @@ -13,25 +13,13 @@ <html:div id="torPreferences-builtinBridge-description"><br/></html:div> </description> <radiogroup id="torPreferences-builtinBridge-typeSelection"> - <hbox hidden="true"> - <radio id="torPreferences-builtinBridges-radioObfs" value="obfs4"/> - </hbox> - <hbox hidden="true" class="indent"> - <html:div id="torPreferences-builtinBridges-descrObfs"></html:div> - </hbox> - <hbox hidden="true"> - <radio id="torPreferences-builtinBridges-radioSnowflake" value="snowflake"/> - </hbox> - <hbox hidden="true" class="indent"> - <html:div id="torPreferences-builtinBridges-descrSnowflake"></html:div> - </hbox> - <hbox hidden="true"> - <radio id="torPreferences-builtinBridges-radioMeekAzure" value="meek-azure"/> - </hbox> - <hbox hidden="true" class="indent"> - <html:div id="torPreferences-builtinBridges-descrMeekAzure"></html:div> - </hbox> - </radiogroup> + <radio id="torPreferences-builtinBridges-radioObfs" value="obfs4" hidden="true"/> + <html:div id="torPreferences-builtinBridges-descrObfs" class="indent" hidden="true"></html:div> + <radio id="torPreferences-builtinBridges-radioSnowflake" value="snowflake" hidden="true"/> + <html:div id="torPreferences-builtinBridges-descrSnowflake" class="indent" hidden="true"></html:div> + <radio id="torPreferences-builtinBridges-radioMeekAzure" value="meek-azure" hidden="true"/> + <html:div id="torPreferences-builtinBridges-descrMeekAzure" class="indent" hidden="true"></html:div> + </radiogroup> <script type="application/javascript"><![CDATA[ "use strict"; diff --git a/browser/components/torpreferences/content/connectionPane.js b/browser/components/torpreferences/content/connectionPane.js index 46fbbfecf832f..292123b0712c4 100644 --- a/browser/components/torpreferences/content/connectionPane.js +++ b/browser/components/torpreferences/content/connectionPane.js @@ -983,33 +983,8 @@ const gConnectionPane = (function() { }, onAddBuiltinBridge() { - let builtinBridgeDialog = new BuiltinBridgeDialog(); - - let sizeObserver = null; - { - let ds = document.querySelector("#dialogStack"); - let boxObserver; - boxObserver = new MutationObserver(() => { - let dialogBox = document.querySelector(".dialogBox"); - if (dialogBox) { - sizeObserver = new MutationObserver(mutations => { - for (const m of mutations) { - if (m.attributeName === "style") { - builtinBridgeDialog.resized(); - break; - } - } - }); - sizeObserver.observe(dialogBox, { attributes: true }); - boxObserver.disconnect(); - } - }); - boxObserver.observe(ds, { childList: true, subtree: true }); - } - + const builtinBridgeDialog = new BuiltinBridgeDialog(); builtinBridgeDialog.openDialog(gSubDialog, aBridgeType => { - sizeObserver.disconnect(); - if (!aBridgeType) { TorSettings.bridges.enabled = false; TorSettings.bridges.builtin_type = ""; @@ -1079,7 +1054,8 @@ function makeBridgeId(bridgeString) { // JS uses UTF-16. While most of these emojis are surrogate pairs, a few // ones fit one UTF-16 character. So we could not use neither indices, // nor substr, nor some function to split the string. -const emojis = [ + /* eslint-disable */ + const emojis = [ "👽","🤖","🧚","🧜","🏄","🐵","🦍","🐶","🐺","🦊","🐈","🦁","🐯","🐴","🦄","🦓", "🦌","🐮","🐷","🐗","🐑","🦙","🦒","🐘","🐭","🐹","🐇","🐿","🦔","🐨","🐼","🦥", "🦨","🦘","🐓","🐥","🐦","🐧","🕊","🦆","🦢","🦉","🦤","🦩","🦚","🦜","🐊","🐢", @@ -1097,7 +1073,7 @@ const emojis = [ "🎸","🎺","🎻","🪕","🥁","☎️","💿","🎥","🎬","📺","📷","🔍","💡","🔦","📖","📚", "🏷","✏️","🖌","🖍","📎","📌","🔑","🪃","🏹","⚙️","🧲","🧪","🧬","🔭","📡","🗿", ]; - + /* eslint-enable */ // FNV-1a implementation that is compatible with other languages const prime = 0x01000193; diff --git a/browser/components/torpreferences/content/connectionSettingsDialog.xhtml b/browser/components/torpreferences/content/connectionSettingsDialog.xhtml index 88aa979256f02..8265cdd71c2f8 100644 --- a/browser/components/torpreferences/content/connectionSettingsDialog.xhtml +++ b/browser/components/torpreferences/content/connectionSettingsDialog.xhtml @@ -9,11 +9,9 @@ <dialog id="torPreferences-connection-dialog" buttons="accept,cancel"> <html:h3 id="torPreferences-connection-header"></html:h3> +  + <checkbox id="torPreferences-connection-toggleProxy" label=""/> <box id="torPreferences-connection-grid"> -  - <hbox class="torPreferences-connection-checkbox-container"> - <checkbox id="torPreferences-connection-toggleProxy" label=""/> - </hbox> <hbox class="indent" align="center"> <label id="torPreferences-localProxy-type"/> </hbox> @@ -40,14 +38,14 @@ <label id="torPreferences-localProxy-password"/> <html:input id="torPreferences-localProxy-textboxPassword" class="torMarginFix" type="password"/> </hbox> -  - <hbox class="torPreferences-connection-checkbox-container"> - <checkbox id="torPreferences-connection-toggleFirewall" label=""/> - </hbox> + </box> +  + <checkbox id="torPreferences-connection-toggleFirewall" label=""/> + <box id="torPreferences-connection-firewall"> <hbox class="indent" align="center"> <label id="torPreferences-connection-allowedPorts"/> </hbox> - <hbox align="center"> + <hbox id="torPreferences-connection-hboxAllowedPorts" align="center"> <html:input id="torPreferences-connection-textboxAllowedPorts" type="text" class="torMarginFix" value="80,443"/> </hbox> </box> diff --git a/browser/components/torpreferences/content/torPreferences.css b/browser/components/torpreferences/content/torPreferences.css index 2ab29bcd60faa..aaedc260bd9f1 100644 --- a/browser/components/torpreferences/content/torPreferences.css +++ b/browser/components/torpreferences/content/torPreferences.css @@ -541,10 +541,6 @@ groupbox#torPreferences-bridges-group textarea { grid-template-columns: auto 1fr; } -.torPreferences-connection-checkbox-container { - grid-column: 1 / 3; -} - #torPreferences-localProxy-textboxAddress, #torPreferences-localProxy-textboxUsername, #torPreferences-localProxy-textboxPassword, @@ -552,6 +548,14 @@ groupbox#torPreferences-bridges-group textarea { -moz-box-flex: 1; } +#torPreferences-connection-firewall { + display: flex; +} + +#torPreferences-connection-hboxAllowedPorts { + flex: 1; +} + /* Tor logs dialog */ textarea#torPreferences-torDialog-textarea { -moz-box-flex: 1; -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0

[tor] branch release-0.4.7 updated (dc7902ed55 -> 254ca6717f)
by gitolite role 15 Jun '22

15 Jun '22

This is an automated email from the git hooks/post-receive script. dgoulet pushed a change to branch release-0.4.7 in repository tor. from dc7902ed55 Merge branch 'tor-gitlab/mr/583' into maint-0.4.7 new e41b680f50 Demote a warning about finding hops in path if no dir info. new 2ce5142718 Changes file for Bug #40603. new 84e31c00da Demote "Unexpected path length" log to info. new 254ca6717f Changes file for Bug 40612 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: changes/bug40603 | 5 +++++ changes/bug40612 | 5 +++++ src/core/or/circuitbuild.c | 18 ++++++++++++++---- 3 files changed, 24 insertions(+), 4 deletions(-) create mode 100644 changes/bug40603 create mode 100644 changes/bug40612 -- To stop receiving notification emails like this one, please contact the administrator of this repository.

1 0