August 2019 - tor-commits - lists.torproject.org

[tor/release-0.4.1] Merge branch 'ticket31343_040' into maint-0.4.1
by nickm＠torproject.org 08 Aug '19

08 Aug '19

commit 0bc5b7ae95a2cc11b380ba09aab0ed1f4219f90b Merge: 40d7f1e3a 7e32db478 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 8 11:23:59 2019 -0400 Merge branch 'ticket31343_040' into maint-0.4.1 changes/bug31343 | 9 +++++++++ src/core/or/channeltls.c | 20 ++++++++++++++++---- src/feature/nodelist/routerlist.c | 6 ++++-- 3 files changed, 29 insertions(+), 6 deletions(-)

1 0

[tor/release-0.4.1] Merge branch 'ticket31343_035' into ticket31343_040
by nickm＠torproject.org 08 Aug '19

08 Aug '19

commit 7e32db478b6619c8e25ad117a59361b1f5cdfa48 Merge: 79569d86b a4400a77a Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Aug 8 09:40:04 2019 -0400 Merge branch 'ticket31343_035' into ticket31343_040 src/feature/nodelist/routerlist.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)

1 0

[snowflake/master] Version bump for webextension
by cohosh＠torproject.org 08 Aug '19

08 Aug '19

commit 0b55fd307a41214d11d266f684e948b5566cdb77 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Thu Aug 8 11:11:56 2019 -0400 Version bump for webextension --- proxy/webext/manifest.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proxy/webext/manifest.json b/proxy/webext/manifest.json index 6b09376..8863dbb 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.0.8", + "version": "0.0.9", "description": "Snowflake is a WebRTC pluggable transport for Tor.", "background": { "scripts": ["snowflake.js"],

1 0

[snowflake/master] Reuse proxypair if sendAnswer fails
by cohosh＠torproject.org 08 Aug '19

08 Aug '19

commit 6cc944f2b452db8e74843ba6644c95201d7873ac Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jul 17 09:22:23 2019 -0400 Reuse proxypair if sendAnswer fails Make sure to set proxypair.active to false if createAnswer or setLocalDescription fails. This should prevent one edge case the results in an infinite loop described in ticket #31100. --- proxy/snowflake.js | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/proxy/snowflake.js b/proxy/snowflake.js index bbf3d8b..ae7aa2c 100644 --- a/proxy/snowflake.js +++ b/proxy/snowflake.js @@ -120,10 +120,11 @@ class Snowflake { var fail, next; next = function(sdp) { dbg('webrtc: Answer ready.'); - return pair.pc.setLocalDescription(sdp); + return pair.pc.setLocalDescription(sdp).catch(fail); }; fail = function() { - return dbg('webrtc: Failed to create Answer'); + pair.active = false + return dbg('webrtc: Failed to create or set Answer'); }; return pair.pc.createAnswer().then(next).catch(fail); }

1 0

[snowflake/master] Add a timeout to check if datachannel opened
by cohosh＠torproject.org 08 Aug '19

08 Aug '19

commit e77baabdcfd742d6dbc4dbf2a74f21ba6d36ad36 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Wed Jul 24 10:52:33 2019 -0400 Add a timeout to check if datachannel opened This is similar to the deadlock bug in the proxy-go instances. If the proxy-pair sends an answer to the broker, it previously assumed that the datachannel would be opened and the pair reused only once the datachannel closed. However, sometimes the datachannel never opens due to ICE errors or a misbehaving/buggy client causing the proxy to infinitely loop and the proxy-pair to remain active. This commit reuses the pair.running attribute to indicate whether or not the datachannel has been opened and sets a timeout to close the proxy-pair if it has not been opened by that time. --- proxy/proxypair.js | 6 ++++-- proxy/snowflake.js | 8 +++++++- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/proxy/proxypair.js b/proxy/proxypair.js index 6ffa9e5..703ac27 100644 --- a/proxy/proxypair.js +++ b/proxy/proxypair.js @@ -85,6 +85,7 @@ class ProxyPair { prepareDataChannel(channel) { channel.onopen = () => { log('WebRTC DataChannel opened!'); + this.running = true; snowflake.state = Snowflake.MODE.WEBRTC_READY; snowflake.ui.setActive(true); // This is the point when the WebRTC datachannel is done, so the next step @@ -176,7 +177,6 @@ class ProxyPair { clearTimeout(this.timer); this.timer = 0; } - this.running = false; if (this.webrtcIsReady()) { this.client.close(); } @@ -186,6 +186,8 @@ class ProxyPair { } this.relay = null; this.onCleanup(); + this.active = false; + this.running = false; } flush() { @@ -245,7 +247,7 @@ ProxyPair.prototype.relay = null; // websocket ProxyPair.prototype.timer = 0; -ProxyPair.prototype.running = true; +ProxyPair.prototype.running = false; // Whether a datachannel is opened ProxyPair.prototype.active = false; // Whether serving a client. diff --git a/proxy/snowflake.js b/proxy/snowflake.js index ae7aa2c..7a242db 100644 --- a/proxy/snowflake.js +++ b/proxy/snowflake.js @@ -74,10 +74,16 @@ class Snowflake { this.ui.setStatus(msg); recv = this.broker.getClientOffer(pair.id); recv.then((desc) => { - if (pair.running) { + if (pair.active) { if (!this.receiveOffer(pair, desc)) { return pair.active = false; } + //set a timeout for channel creation + return setTimeout((() => { + log('proxypair datachannel timed out waiting for open'); + pair.close(); + return pair.active = false; + }), 20000); // 20 second timeout } else { return pair.active = false; }

1 0

[tpo/master] fixes #31325 - Update Sponsors page with "Digital Impact Alliance" entry
by pili＠torproject.org 08 Aug '19

08 Aug '19

commit 70a6c8df35b7997cf5314fb477864a2451e00b8b Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Aug 8 14:22:27 2019 +0100 fixes #31325 - Update Sponsors page with "Digital Impact Alliance" entry --- assets/static/images/sponsors/dial.png | Bin 0 -> 26001 bytes content/about/sponsors/dial/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/assets/static/images/sponsors/dial.png b/assets/static/images/sponsors/dial.png new file mode 100644 index 0000000..bd3566f Binary files /dev/null and b/assets/static/images/sponsors/dial.png differ diff --git a/content/about/sponsors/dial/contents.lr b/content/about/sponsors/dial/contents.lr new file mode 100644 index 0000000..c161189 --- /dev/null +++ b/content/about/sponsors/dial/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: True +--- +time: 2019 +--- +name: Digital Impact Alliance +--- +key: 17 +--- +logo: /static/images/sponsors/dial.png +--- +_hidden: yes +--- +link: https://digitalimpactalliance.org/ +--- +description: + +The Digital Impact Alliance (DIAL) advances digital inclusion to achieve the Sustainable Development Goals (SDGs), so that all women, men and children can benefit from life-enhancing, mobile-based digital services. DIAL is supporting a project to complete a successful ESR transition for Tor Browser to we ensure stability, security, and usability of this core privacy technology on both desktop and mobile.

1 0

[tpo/master] Add Craig Newmark Philanthropies to Sponsors
by pili＠torproject.org 08 Aug '19

08 Aug '19

commit 262035aebca84588bb6e1b62f826bdb5ef0170d4 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Aug 2 14:28:58 2019 +0100 Add Craig Newmark Philanthropies to Sponsors --- .../images/sponsors/craig-newmark-philanthropies.png | Bin 0 -> 29629 bytes .../craig-newmark-philanthropies/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/assets/static/images/sponsors/craig-newmark-philanthropies.png b/assets/static/images/sponsors/craig-newmark-philanthropies.png new file mode 100644 index 0000000..76145b3 Binary files /dev/null and b/assets/static/images/sponsors/craig-newmark-philanthropies.png differ diff --git a/content/about/sponsors/craig-newmark-philanthropies/contents.lr b/content/about/sponsors/craig-newmark-philanthropies/contents.lr new file mode 100644 index 0000000..87b3312 --- /dev/null +++ b/content/about/sponsors/craig-newmark-philanthropies/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: True +--- +time: 2019 +--- +name: Craig Newmark Philanthropies +--- +key: 16 +--- +logo: /static/images/sponsors/craig-newmark-philanthropies.png +--- +_hidden: yes +--- +link: https://craignewmarkphilanthropies.org/ +--- +description: + +Craig Newmark Philanthropies was created by craigslist founder Craig Newmark to support and connect people and drive broad civic engagement. The organization works to advance people and grassroots organizations that are getting stuff done in areas that include trustworthy journalism, voter protection, gender diversity in technology, and veterans and military families. The organization has provided Tor Project with an unrestricted gift.

1 0

[tpo/master] Update CNP logo
by pili＠torproject.org 08 Aug '19

08 Aug '19

commit b699aa40c687d22be35eb65e50f9454d8bf1a153 Author: Pili Guerra <pili(a)piliguerra.com> Date: Fri Aug 2 14:28:58 2019 +0100 Update CNP logo --- .../sponsors/craig-newmark-philanthropies.png | Bin 29629 -> 28397 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/assets/static/images/sponsors/craig-newmark-philanthropies.png b/assets/static/images/sponsors/craig-newmark-philanthropies.png index 76145b3..f6ece06 100644 Binary files a/assets/static/images/sponsors/craig-newmark-philanthropies.png and b/assets/static/images/sponsors/craig-newmark-philanthropies.png differ

1 0

[tpo/staging] fixes #31325 - Update Sponsors page with "Digital Impact Alliance" entry
by pili＠torproject.org 08 Aug '19

08 Aug '19

commit 579a75158fd22b53e498bb9d42547cb0144fe51a Author: Pili Guerra <pili(a)piliguerra.com> Date: Thu Aug 8 14:22:27 2019 +0100 fixes #31325 - Update Sponsors page with "Digital Impact Alliance" entry --- assets/static/images/sponsors/dial.png | Bin 0 -> 26001 bytes content/about/sponsors/dial/contents.lr | 19 +++++++++++++++++++ 2 files changed, 19 insertions(+) diff --git a/assets/static/images/sponsors/dial.png b/assets/static/images/sponsors/dial.png new file mode 100644 index 0000000..bd3566f Binary files /dev/null and b/assets/static/images/sponsors/dial.png differ diff --git a/content/about/sponsors/dial/contents.lr b/content/about/sponsors/dial/contents.lr new file mode 100644 index 0000000..c161189 --- /dev/null +++ b/content/about/sponsors/dial/contents.lr @@ -0,0 +1,19 @@ +_model: sponsor +--- +active: True +--- +time: 2019 +--- +name: Digital Impact Alliance +--- +key: 17 +--- +logo: /static/images/sponsors/dial.png +--- +_hidden: yes +--- +link: https://digitalimpactalliance.org/ +--- +description: + +The Digital Impact Alliance (DIAL) advances digital inclusion to achieve the Sustainable Development Goals (SDGs), so that all women, men and children can benefit from life-enhancing, mobile-based digital services. DIAL is supporting a project to complete a successful ESR transition for Tor Browser to we ensure stability, security, and usability of this core privacy technology on both desktop and mobile.

1 0

[translation/support-portal_completed] Update translations for support-portal_completed
by translation＠torproject.org 08 Aug '19

08 Aug '19

commit f6bf8dc233a473eea9e4cda4c0f7aba592561d3f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Aug 8 13:22:16 2019 +0000 Update translations for support-portal_completed --- contents+is.po | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/contents+is.po b/contents+is.po index fdace85c5..2f212637e 100644 --- a/contents+is.po +++ b/contents+is.po @@ -393,7 +393,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Installing GnuPG" -msgstr "" +msgstr "### Uppsetning GnuPG" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -407,7 +407,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For Windows users:" -msgstr "" +msgstr "#### Fyrir notendur Windows :" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -445,7 +445,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "#### For GNU/Linux users:" -msgstr "" +msgstr "#### Fyrir notendur GNU/Linux:" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -510,12 +510,12 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "pub rsa4096 2014-12-15 [C] [expires: 2020-08-24]" -msgstr "" +msgstr "pub rsa4096 2014-12-15 [C] [expires: 2020-08-24]" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "EF6E286DDA85EA2A4BA7DE684E2C6E8793298290" -msgstr "" +msgstr "EF6E286DDA85EA2A4BA7DE684E2C6E8793298290" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -527,7 +527,7 @@ msgstr "" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]" -msgstr "" +msgstr "sub rsa4096 2018-05-26 [S] [expires: 2020-09-12]" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -542,11 +542,13 @@ msgid "" "gpg --output ./tor.keyring --export " "0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290" msgstr "" +"gpg --output ./tor.keyring --export " +"0xEF6E286DDA85EA2A4BA7DE684E2C6E8793298290" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) msgid "### Verifying the signature" -msgstr "" +msgstr "### Sannreyna undirritunina" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -599,6 +601,8 @@ msgid "" "gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.4-osx64_en-" "US.dmg{.asc,}" msgstr "" +"gpgv --keyring ./tor.keyring ~/Downloads/TorBrowser-8.5.4-osx64_en-" +"US.dmg{.asc,}" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description) @@ -611,6 +615,7 @@ msgstr "" msgid "" "gpgv --keyring ./tor.keyring tor-browser-linux64-8.5.4_en-US.tar.xz{.asc,}" msgstr "" +"gpgv --keyring ./tor.keyring tor-browser-linux64-8.5.4_en-US.tar.xz{.asc,}" #: https//support.torproject.org/tbb/how-to-verify-signature/ #: (content/tbb/how-to-verify-signature/contents+en.lrquestion.description)

1 0