September 2017 - tor-commits - lists.torproject.org

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 11 Sep '17

11 Sep '17

commit 34b30006413ad82a90277c4d1cb20a742b2ba42e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 11 21:46:08 2017 +0000 Update translations for mat-gui --- be.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/be.po b/be.po index 0cf967188..ae9966ce0 100644 --- a/be.po +++ b/be.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2016-02-10 23:06+0100\n" -"PO-Revision-Date: 2017-09-11 09:27+0000\n" +"PO-Revision-Date: 2017-09-11 21:21+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] downgrade warning for #23465
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit b719fa7efe8678cc5d90a57ea3c1fe370246a473 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:50:43 2017 -0400 downgrade warning for #23465 --- src/or/hs_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 1fbea95e2..cde0231d9 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -1017,7 +1017,7 @@ hs_client_refetch_hsdesc(const ed25519_public_key_t *identity_pk) cached_desc = hs_cache_lookup_as_client(identity_pk); if (cached_desc && hs_client_any_intro_points_usable(identity_pk, cached_desc)) { - log_warn(LD_GENERAL, "We would fetch a v3 hidden service descriptor " + log_info(LD_GENERAL, "We would fetch a v3 hidden service descriptor " "but we already have a usable descriptor."); return 0; }

1 0

[tor/master] spelling
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit c5a55975725077f29ab499311788b182dfb54fe2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:48:27 2017 -0400 spelling --- src/or/hs_client.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/or/hs_client.c b/src/or/hs_client.c index c8b65aeab..1fbea95e2 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -1018,7 +1018,7 @@ hs_client_refetch_hsdesc(const ed25519_public_key_t *identity_pk) if (cached_desc && hs_client_any_intro_points_usable(identity_pk, cached_desc)) { log_warn(LD_GENERAL, "We would fetch a v3 hidden service descriptor " - "but we already have a useable descriprot."); + "but we already have a usable descriptor."); return 0; } }

1 0

[translation/tor-and-https] Update translations for tor-and-https
by translation＠torproject.org 11 Sep '17

11 Sep '17

commit 244dd0d0c535a376312d9b6f96635a6e50125a3e Author: Translation commit bot <translation(a)torproject.org> Date: Mon Sep 11 20:47:36 2017 +0000 Update translations for tor-and-https --- be.po | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-) diff --git a/be.po b/be.po index fe38e546a..5a400f9da 100644 --- a/be.po +++ b/be.po @@ -3,15 +3,15 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"POT-Creation-Date: 2014-05-24 16:09+0000\n" -"PO-Revision-Date: 2014-05-25 09:55+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Belarusian (http://www.transifex.com/projects/p/torproject/language/be/)\n" +"POT-Creation-Date: 2014-07-17 14:23+0000\n" +"PO-Revision-Date: 2017-09-11 20:27+0000\n" +"Last-Translator: runasand <inactive+runasand(a)transifex.com>\n" +"Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: be\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #. (itstool) path: C/tor-and-https.svg/svg@direction #. (itstool) comment: C/tor-and-https.svg/svg@direction @@ -29,107 +29,107 @@ msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Site.com" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "user / pw" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "data" msgstr "" #. (itstool) path: defs/text #. Keep it short: 7em max. Seven times the capital letter "M". -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "location" msgstr "" #. (itstool) path: defs/text #. Keep it short: 3em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "WiFi" msgstr "" #. (itstool) path: defs/text #. Keep it short: 4em max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "ISP" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Hacker" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Lawyer" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Sysadmin" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Police" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "NSA" msgstr "" #. (itstool) path: defs/text #. Keep it short: 8em is ok, 9em is max. -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Tor relay" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Key" -msgstr "" +msgstr "Ключ" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Internet connection" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Eavesdropping" msgstr "" #. (itstool) path: defs/text -#: C/tor-and-https.svg:348 +#: C/tor-and-https.svg:363 #, no-wrap msgid "Data sharing" msgstr ""

1 0

[tor/master] hs: Handled REND_JOINED circuit when getting an INTRODUCE_ACK
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit b71f4ecb8d289f0d8a44eaadedf51773640ff2b8 Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Sep 11 11:06:22 2017 -0400 hs: Handled REND_JOINED circuit when getting an INTRODUCE_ACK Because we can get a RENDEZVOUS2 cell before the INTRODUCE_ACK, we need to correctly handle the circuit purpose REND_JOINED that is not change its purpose when we get an INTRODUCE_ACK and simply close the intro circuit normally. Fixes #23455 Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/or/hs_circuitmap.c | 24 +++++++++++++++++++++--- src/or/hs_client.c | 8 ++++++++ 2 files changed, 29 insertions(+), 3 deletions(-) diff --git a/src/or/hs_circuitmap.c b/src/or/hs_circuitmap.c index 09704d796..63d5c1ba2 100644 --- a/src/or/hs_circuitmap.c +++ b/src/or/hs_circuitmap.c @@ -407,9 +407,20 @@ hs_circuitmap_get_rend_circ_service_side(const uint8_t *cookie) } /* Public function: Return client-side rendezvous circuit with rendezvous - * <b>cookie</b>. It will first lookup for the CIRCUIT_PURPOSE_C_REND_READY - * purpose and then try for CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED and then - * finally tries for CIRCUIT_PURPOSE_C_ESTABLISH_REND. + * <b>cookie</b>. It will look for circuits with the following purposes: + + * a) CIRCUIT_PURPOSE_C_REND_READY: Established rend circuit (received + * RENDEZVOUS_ESTABLISHED). Waiting for RENDEZVOUS2 from service, and for + * INTRODUCE_ACK from intro point. + * + * b) CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED: Established rend circuit and + * introduce circuit acked. Waiting for RENDEZVOUS2 from service. + * + * c) CIRCUIT_PURPOSE_C_REND_JOINED: Established rend circuit and received + * RENDEZVOUS2 from service. + * + * d) CIRCUIT_PURPOSE_C_ESTABLISH_REND: Rend circuit open but not yet + * established. * * Return NULL if no such circuit is found in the circuitmap. */ origin_circuit_t * @@ -433,6 +444,13 @@ hs_circuitmap_get_rend_circ_client_side(const uint8_t *cookie) circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE, REND_TOKEN_LEN, cookie, + CIRCUIT_PURPOSE_C_REND_JOINED); + if (circ) { + return circ; + } + + circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE, + REND_TOKEN_LEN, cookie, CIRCUIT_PURPOSE_C_ESTABLISH_REND); return circ; } diff --git a/src/or/hs_client.c b/src/or/hs_client.c index f85ebc847..652b7cf74 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -746,6 +746,14 @@ handle_introduce_ack_success(origin_circuit_t *intro_circ) } assert_circ_anonymity_ok(rend_circ, get_options()); + + /* It is possible to get a RENDEZVOUS2 cell before the INTRODUCE_ACK which + * means that the circuit will be joined and already transmitting data. In + * that case, simply skip the purpose change and close the intro circuit + * like it should be. */ + if (TO_CIRCUIT(rend_circ)->purpose == CIRCUIT_PURPOSE_C_REND_JOINED) { + goto end; + } circuit_change_purpose(TO_CIRCUIT(rend_circ), CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED); /* Set timestamp_dirty, because circuit_expire_building expects it to

1 0

[tor/master] Merge remote-tracking branch 'dgoulet/bug23455_032_01'
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 2a1ddd78da86d6a675146ae2afabfbcede437a95 Merge: 007d3d233 b71f4ecb8 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:32:40 2017 -0400 Merge remote-tracking branch 'dgoulet/bug23455_032_01' src/or/hs_circuitmap.c | 24 +++++++++++++++++++++--- src/or/hs_client.c | 8 ++++++++ 2 files changed, 29 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 8b4ff0168ac4d9ec758fdf50769067d55c7a061d Merge: 4d4e2fc22 d4f87073a Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit c894e9d3d44bceaf209a9b73c2c43911af3eb1a8 Merge: f5092e711 6a49e3360 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22797 | 4 ++++ src/common/compat.c | 19 ++++++++++++------- 2 files changed, 16 insertions(+), 7 deletions(-)

1 0

[tor/release-0.3.1] Fix mixed-sign comparison warning in fix for 22797.
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit 6a49e3360bcb30b267da4a47af749bd4571ee72d Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jul 5 15:56:57 2017 -0400 Fix mixed-sign comparison warning in fix for 22797. --- src/common/compat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/common/compat.c b/src/common/compat.c index 3ebcfad14..e16dfb1d2 100644 --- a/src/common/compat.c +++ b/src/common/compat.c @@ -1719,7 +1719,7 @@ set_max_file_descriptors(rlim_t limit, int *max_out) int bad = 1; #ifdef OPEN_MAX uint64_t try_limit = OPEN_MAX - ULIMIT_BUFFER; - if (errno == EINVAL && try_limit < rlim.rlim_cur) { + if (errno == EINVAL && try_limit < (uint64_t) rlim.rlim_cur) { /* On some platforms, OPEN_MAX is the real limit, and getrlimit() is * full of nasty lies. I'm looking at you, OSX 10.5.... */ rlim.rlim_cur = try_limit;

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 11 Sep '17

11 Sep '17

commit d4f87073aec5e8ef6090cf8f246ffd7483968567 Merge: 72ea4a8f0 c894e9d3d Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Sep 11 16:29:10 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0