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

[tor/master] changes file for ticket30935
by dgoulet＠torproject.org 26 Aug '19

26 Aug '19

commit 38c4e1426c2964f4c27d2486b81867bff6d55b8a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 26 09:33:29 2019 -0400 changes file for ticket30935 --- changes/ticket30935 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/ticket30935 b/changes/ticket30935 new file mode 100644 index 000000000..5a7e91889 --- /dev/null +++ b/changes/ticket30935 @@ -0,0 +1,6 @@ + o Code simplification and refactoring: + - Numerous simplifications in configuration-handling logic: + remove duplicated macro definitions, replace magical names + with flags, and refactor "TestingTorNetwork" to use the + same default-option logic as the rest of Tor. + Closes ticket 30935.

1 0

[snowflake/master] Version bump for bug #31385
by cohosh＠torproject.org 26 Aug '19

26 Aug '19

commit 4b6871a24e857201357e614657a6df223639e2c8 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Mon Aug 26 09:16:47 2019 -0400 Version bump for bug #31385 --- 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 af15e93..bc93608 100644 --- a/proxy/webext/manifest.json +++ b/proxy/webext/manifest.json @@ -1,7 +1,7 @@ { "manifest_version": 2, "name": "Snowflake", - "version": "0.0.9", + "version": "0.0.10", "description": "__MSG_appDesc__", "default_locale": "en_US", "background": {

1 0

[snowflake/master] Fix to check running status before closing proxy
by cohosh＠torproject.org 26 Aug '19

26 Aug '19

commit 8a5941daab398cd7595c5fdfdae4afb2acc271a9 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Fri Aug 23 15:45:18 2019 -0400 Fix to check running status before closing proxy This fixes a bug reported in #31385. There was an error with the proxy deadlock fix in #31100 where we close proxies regardless of connection status. --- proxy/snowflake.js | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/proxy/snowflake.js b/proxy/snowflake.js index 7a242db..0edb42c 100644 --- a/proxy/snowflake.js +++ b/proxy/snowflake.js @@ -78,11 +78,13 @@ class Snowflake { if (!this.receiveOffer(pair, desc)) { return pair.active = false; } - //set a timeout for channel creation + //set a timeout for channel creation return setTimeout((() => { - log('proxypair datachannel timed out waiting for open'); - pair.close(); - return pair.active = false; + if (!pair.running) { + 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

[snowflake/master] Added check for active pair in onopen
by cohosh＠torproject.org 26 Aug '19

26 Aug '19

commit 16a1b69823fd1b699a273c54dfe359d794d60220 Author: Cecylia Bocovich <cohosh(a)torproject.org> Date: Sat Aug 24 19:02:54 2019 -0400 Added check for active pair in onopen Because the timeout makes the pair inactive, we should check for this state in onopen before connecting to the client. Updated tests to set the proxy pair to active before testing onopen. Also removed a redundant statement. --- proxy/proxypair.js | 3 +++ proxy/snowflake.js | 2 -- proxy/spec/proxypair.spec.js | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/proxy/proxypair.js b/proxy/proxypair.js index 703ac27..fd5a39a 100644 --- a/proxy/proxypair.js +++ b/proxy/proxypair.js @@ -85,6 +85,9 @@ class ProxyPair { prepareDataChannel(channel) { channel.onopen = () => { log('WebRTC DataChannel opened!'); + if (!this.active) { + return + } this.running = true; snowflake.state = Snowflake.MODE.WEBRTC_READY; snowflake.ui.setActive(true); diff --git a/proxy/snowflake.js b/proxy/snowflake.js index 0edb42c..cdc59fb 100644 --- a/proxy/snowflake.js +++ b/proxy/snowflake.js @@ -86,8 +86,6 @@ class Snowflake { return pair.active = false; } }), 20000); // 20 second timeout - } else { - return pair.active = false; } }, function() { return pair.active = false; diff --git a/proxy/spec/proxypair.spec.js b/proxy/spec/proxypair.spec.js index 3716f2d..f15d6d2 100644 --- a/proxy/spec/proxypair.spec.js +++ b/proxy/spec/proxypair.spec.js @@ -100,6 +100,7 @@ describe('ProxyPair', function() { it('connects to the relay once datachannel opens', function() { spyOn(pp, 'connectRelay'); + pp.active = true; pp.client.onopen(); expect(pp.connectRelay).toHaveBeenCalled(); });

1 0

[translation-tools/master] remove discontinued lektor project
by emmapeel＠torproject.org 26 Aug '19

26 Aug '19

commit 5c3858540f0dee86b586b600ba0570716169c267 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Aug 26 13:08:39 2019 +0000 remove discontinued lektor project --- config | 1 - 1 file changed, 1 deletion(-) diff --git a/config b/config index 02f45b5..f2ac4f8 100644 --- a/config +++ b/config @@ -18,7 +18,6 @@ https_everywhere https_everywhere_completed liveusb-creator liveusb-creator_completed mat-gui mat-gui_completed orfox-stringsxml orfox-stringsxml_completed -researchtpo-contentspot researchtpo-contentspot_completed snowflakeaddon-messages.json snowflakeaddon-messages.json_completed snowflake-website-indexhtml snowflake-website-indexhtml_completed tails-misc tails-misc_completed tails-misc_release

1 0

[translation/tails-misc_release] Update translations for tails-misc_release
by translation＠torproject.org 26 Aug '19

26 Aug '19

commit 670c4b870918a87dd0d02b42d8121517b627e01a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 26 08:20:59 2019 +0000 Update translations for tails-misc_release --- zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 6968e6b8d..d6dace9c3 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -6,7 +6,7 @@ # Agustín Wu <losangwuyts(a)gmail.com>, 2016 # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 -# Chi-Hsun Tsai, 2017-2018 +# Chi-Hsun Tsai, 2017-2019 # danfong <danfong.hsieh(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2019 @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-24 02:11+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-08-26 08:11+0000\n" +"Last-Translator: Chi-Hsun Tsai\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Aug '19

26 Aug '19

commit 37ddd9b38b1faec3eaa3bbd008e754c362a34654 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 26 08:19:56 2019 +0000 Update translations for tails-misc --- zh_TW.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/zh_TW.po b/zh_TW.po index 6968e6b8d..d6dace9c3 100644 --- a/zh_TW.po +++ b/zh_TW.po @@ -6,7 +6,7 @@ # Agustín Wu <losangwuyts(a)gmail.com>, 2016 # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2014 -# Chi-Hsun Tsai, 2017-2018 +# Chi-Hsun Tsai, 2017-2019 # danfong <danfong.hsieh(a)gmail.com>, 2014 # danfong <danfong.hsieh(a)gmail.com>, 2014 # Hsiu-Ming Chang <cges30901(a)gmail.com>, 2019 @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-08-14 14:11+0200\n" -"PO-Revision-Date: 2019-08-24 02:11+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-08-26 08:11+0000\n" +"Last-Translator: Chi-Hsun Tsai\n" "Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n"

1 0

[translation/tor-and-https_completed] Update translations for tor-and-https_completed
by translation＠torproject.org 26 Aug '19

26 Aug '19

commit 2d92bffc30bee28663f0bd773af7ff534c7fd2af Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 26 04:26:19 2019 +0000 Update translations for tor-and-https_completed --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 7f2a56143..03e0e7bfc 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -1,6 +1,6 @@ # # Translators: -# bnw, 2014 +# 5b4c6a53e2e9f6d66be0455f2c8d22a2, 2014 # khi, 2014 # YFdyh000 <yfdyh000(a)gmail.com>, 2014 msgid ""

1 0

[translation/tails-misc_release] Update translations for tails-misc_release
by translation＠torproject.org 26 Aug '19

26 Aug '19

commit aa6e3939e52a170d9e7dd8475d2109c811bf45db Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 26 04:21:07 2019 +0000 Update translations for tails-misc_release --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 6217eb8db..59f11a6ec 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,7 +10,7 @@ # Emma Peel, 2019 # ff98sha, 2019 # Herman Koe <hkoe.academic(a)gmail.com>, 2018 -# bnw, 2014 +# 5b4c6a53e2e9f6d66be0455f2c8d22a2, 2014 # Lafrenze Laurant, 2018 # James David, 2019 # Meng San, 2014

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Aug '19

26 Aug '19

commit 2e15739ebe773c5d516039c94ae3983af3738b32 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Aug 26 04:20:03 2019 +0000 Update translations for tails-misc --- zh_CN.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_CN.po b/zh_CN.po index 6217eb8db..59f11a6ec 100644 --- a/zh_CN.po +++ b/zh_CN.po @@ -10,7 +10,7 @@ # Emma Peel, 2019 # ff98sha, 2019 # Herman Koe <hkoe.academic(a)gmail.com>, 2018 -# bnw, 2014 +# 5b4c6a53e2e9f6d66be0455f2c8d22a2, 2014 # Lafrenze Laurant, 2018 # James David, 2019 # Meng San, 2014

1 0