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

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

11 Dec '17

commit 377b54ab07eaad375c04f4a14ce71707afd6907f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 11 17:46:28 2017 +0000 Update translations for mat-gui --- az.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az.po b/az.po index 718c0593b..b9ae074e9 100644 --- a/az.po +++ b/az.po @@ -9,7 +9,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-10-16 15:16+0000\n" +"PO-Revision-Date: 2017-12-11 17:22+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 11 Dec '17

11 Dec '17

commit 38ed08f8fb1dd2032b3e325a9cc22bdb0eed2855 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 11 17:46:04 2017 +0000 Update translations for tails-persistence-setup --- az/az.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az/az.po b/az/az.po index 98b740a6e..783b705b1 100644 --- a/az/az.po +++ b/az/az.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2017-05-15 13:51+0200\n" -"PO-Revision-Date: 2017-09-19 17:08+0000\n" +"PO-Revision-Date: 2017-12-11 17:28+0000\n" "Last-Translator: carolyn <carolyn(a)anhalt.org>\n" "Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n" "MIME-Version: 1.0\n"

1 0

[translation/tor-messenger-otrproperties] Update translations for tor-messenger-otrproperties
by translation＠torproject.org 11 Dec '17

11 Dec '17

commit af6ab3d9edef891e13292c79172749b466d23adb Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 11 16:19:46 2017 +0000 Update translations for tor-messenger-otrproperties --- ms_MY/otr.properties | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/ms_MY/otr.properties b/ms_MY/otr.properties index f4505ad96..48358977e 100644 --- a/ms_MY/otr.properties +++ b/ms_MY/otr.properties @@ -13,19 +13,19 @@ msgevent.log_heartbeat_sent=Heartbeat sent to %S. msgevent.rcvdmsg_general_err=Satu ralat OTR telah berlaku. msgevent.rcvdmsg_unecrypted=Mesej berikut telah diterima dariapda %S tidak disulitkan: %S msgevent.rcvdmsg_unrecognized=Kami telah menerima satu mesej OTR yang tidak dikenalpasti daripada %S. -msgevent.rcvdmsg_for_other_instance=%S has sent a message intended for a different session. If you are logged in multiple times, another session may have received the message. -context.gone_secure_private=Private conversation with %S started. -context.gone_secure_unverified=Private conversation with %S started. However, their identity has not been verified. -context.still_secure=Successfully refreshed the private conversation with %S. -error.enc=Error occurred encrypting message. -error.not_priv=You sent encrypted data to %S, who wasn't expecting it. -error.unreadable=You transmitted an unreadable encrypted message. -error.malformed=You transmitted a malformed data message. -resent=[resent] +msgevent.rcvdmsg_for_other_instance=%S telah menghantar satu mesej yang sepatutnya ke sesi lain. Jika anda mendaftar masuk lebih dari sekali, sesi yang lain mungki telah menerima mesej tersebut. +context.gone_secure_private=Perbualan persendirian dengan %S telah bermula. +context.gone_secure_unverified=Perbualan persendirian dengan %S telah bermula. Walaubagaimanapun, identiti beliau belum disahkan lagi. +context.still_secure=Berjaya menyegar semula perbualan persendirian dengan %S. +error.enc=Ralat berlaku ketika menyulitkan mesej. +error.not_priv=Anda telah menghantar data tersulit kepada %S, yang mana beliau tidak menjangkakannya. +error.unreadable=Anda telah menghantar satu mesej tersulit yang tidak boleh dibaca. +error.malformed=Anda telah menghantar satu mesej data yang cacat. +resent=[hantar semula] tlv.disconnected=%S telah menamatkan perbualan persendirian mereka dengan anda; anda patut lakukan perkara yang sama. query.msg=%S has requested an Off-the Record private conversation. However, you do not have a plugin to support that. See http://otr.cypherpunks.ca/ for more information. -trust.unused=Unused -trust.not_private=Not Private -trust.unverified=Unverified -trust.private=Private -trust.finished=Finished +trust.unused=Tidak Digunakan +trust.not_private=Bukan Persendirian +trust.unverified=Belum Disahkan +trust.private=Persendirian +trust.finished=Selesai

1 0

[atlas/master] Render HTML in details page tooltips (Fixes: #24538)
by irl＠torproject.org 11 Dec '17

11 Dec '17

commit 289efd3c9110665ce90b28c26ad2b617f0778dd8 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Dec 11 14:45:19 2017 +0000 Render HTML in details page tooltips (Fixes: #24538) --- js/views/details/main.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/js/views/details/main.js b/js/views/details/main.js index 22bbc27..3597dca 100644 --- a/js/views/details/main.js +++ b/js/views/details/main.js @@ -237,7 +237,10 @@ define([ $("#history-tab-content").html("Graphs cannot be shown as your browser does not support Scalable Vector Graphics (SVG). This is the case when Tor Browser is in High Security mode."); } - $(".tip").tooltip({ placement: 'right' }); + $(".tip").tooltip({ + placement: 'right', + html: true + }); }, error: function() { var compiledTemplate = _.template(errorDetailsTemplate);

1 0

[atlas/master] Bump cache breaker
by irl＠torproject.org 11 Dec '17

11 Dec '17

commit 0c5bb26c39e7b3b96e4ba84b124037292bbb0543 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Dec 11 15:13:44 2017 +0000 Bump cache breaker --- index.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/index.html b/index.html index b2f1ca6..22d8491 100644 --- a/index.html +++ b/index.html @@ -41,7 +41,7 @@ <script src="https://metrics.torproject.org/js/script.js"></script>  - <link rel="stylesheet" href="css/atlas.css?v13"> + <link rel="stylesheet" href="css/atlas.css?v14"> </head> @@ -167,7 +167,7 @@ $('.cookie-message').cookieBar({ closeButton: '.cbc' }); </script> <script> var require = { - urlArgs: "v13" + urlArgs: "v14" }; </script> <script data-main="js/main" src="js/libs/require/require.js"></script>

1 0

[atlas/master] Escape contact information before display in template
by irl＠torproject.org 11 Dec '17

11 Dec '17

commit 37a65a761afa5a62630c620ac00f42a228604df7 Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Dec 11 15:13:19 2017 +0000 Escape contact information before display in template --- templates/details/router.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/details/router.html b/templates/details/router.html index 2aea6b2..c9f79d5 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -24,7 +24,7 @@ <dd><%= relay.get('or_addresses') %></dd> <dt><span class="tip" title="These are the contact details of the Tor relay operator">Contact</span></dt> - <dd><%= _.escape( relay.get('contact')!='undefined' ? relay.get('contact') : 'none' ) %></dd> + <dd><%= _.escape( relay.get('contact')!='undefined' ? _.escape(relay.get('contact')) : 'none' ) %></dd> <dt><span class="tip" title="Address and port where the relay listens for directory requests.">Dir Address</span></dt> <dd><%= relay.get('dir_address') ? relay.get('dir_address') : 'none' %></dd>

1 0

[atlas/master] Makes primary IP address and nickname searchable on details page (Fixes: #24533)
by irl＠torproject.org 11 Dec '17

11 Dec '17

commit 699a39ff77879c6a7fe79874edfae9015795953b Author: Iain R. Learmonth <irl(a)fsfe.org> Date: Mon Dec 11 15:02:44 2017 +0000 Makes primary IP address and nickname searchable on details page (Fixes: #24533) --- templates/details/router.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/templates/details/router.html b/templates/details/router.html index 89edf81..2aea6b2 100644 --- a/templates/details/router.html +++ b/templates/details/router.html @@ -17,10 +17,10 @@ <div class="col-md-6"> <h3>Configuration</h3> <dl> - <dt><span class="tip" title="This is the nickname that the Tor relay operator chose.">Nickname</span></dt> + <dt><span class="tip" title="This is the nickname that the Tor relay operator chose.">Nickname</span> <a href="#search/<%= _.escape(relay.get('nickname')) %>"><i class="fa fa-search"></i></a></dt> <dd><%= _.escape(relay.get('nickname')) %></dd> - <dt><span class="tip" title="Addresses and ports where the relay listens for incoming connections from clients and other relays.">OR Addresses</span></dt> + <dt><span class="tip" title="Addresses and ports where the relay listens for incoming connections from clients and other relays.">OR Addresses</span> <a href="#search/<%= relay.get('or_addresses')[0].split(":")[0] %>"><i class="fa fa-search"></i></a></dt> <dd><%= relay.get('or_addresses') %></dd> <dt><span class="tip" title="These are the contact details of the Tor relay operator">Contact</span></dt>

1 0

[tor/master] Use mach_approximate_time() for coarse time where available.
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 021fdd39e4ebbe8ddee9b10823af76fbb11e7878 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Dec 8 09:24:02 2017 -0500 Use mach_approximate_time() for coarse time where available. This lets us have a coarse-time implementation with reasonable performance characteristics on OSX and iOS. Implements 24427. --- changes/feature24427 | 5 +++++ configure.ac | 1 + src/common/compat_time.c | 15 +++++++++++++++ src/common/compat_time.h | 3 +++ 4 files changed, 24 insertions(+) diff --git a/changes/feature24427 b/changes/feature24427 new file mode 100644 index 000000000..8650c45d3 --- /dev/null +++ b/changes/feature24427 @@ -0,0 +1,5 @@ + o Minor features (OSX, iOS, performance): + - Use the mach_approximate_time() function (when available) to + implement coarse monotonic time. Having a coarse time function + should avoid a large number of system calls, and improve + performance slightly, especially under load. Closes ticket 24427. diff --git a/configure.ac b/configure.ac index 0b3e1dda2..84ae9090b 100644 --- a/configure.ac +++ b/configure.ac @@ -506,6 +506,7 @@ AC_CHECK_FUNCS( llround \ localtime_r \ lround \ + mach_approximate_time \ memmem \ memset_s \ pipe \ diff --git a/src/common/compat_time.c b/src/common/compat_time.c index 204b8d7d1..c0cd73c74 100644 --- a/src/common/compat_time.c +++ b/src/common/compat_time.c @@ -314,6 +314,21 @@ monotime_get(monotime_t *out) out->abstime_ = mach_absolute_time(); } +#if defined(HAVE_MACH_APPROXIMATE_TIME) +void +monotime_coarse_get(monotime_coarse_t *out) +{ +#ifdef TOR_UNIT_TESTS + if (monotime_mocking_enabled) { + out->abstime_ = (mock_time_nsec_coarse * mach_time_info.denom) + / mach_time_info.numer; + return; + } +#endif /* defined(TOR_UNIT_TESTS) */ + out->abstime_ = mach_approximate_time(); +} +#endif + /** * Return the number of nanoseconds between <b>start</b> and <b>end</b>. */ diff --git a/src/common/compat_time.h b/src/common/compat_time.h index 462dcecce..bcf469e27 100644 --- a/src/common/compat_time.h +++ b/src/common/compat_time.h @@ -65,6 +65,9 @@ typedef struct monotime_t { typedef struct monotime_coarse_t { uint64_t tick_count_; } monotime_coarse_t; +#elif defined(__APPLE__) && defined(HAVE_MACH_APPROXIMATE_TIME) +#define MONOTIME_COARSE_FN_IS_DIFFERENT +#define monotime_coarse_t monotime_t #else #define monotime_coarse_t monotime_t #endif /* defined(CLOCK_MONOTONIC_COARSE) && ... || ... */

1 0

[tor/master] Merge remote-tracking branch 'public/feature24427'
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit ea929e8456d065a25d7eb5e2e0e41e0f303ebe9d Merge: c2822bbc6 021fdd39e Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Dec 11 09:59:46 2017 -0500 Merge remote-tracking branch 'public/feature24427' changes/feature24427 | 5 +++++ configure.ac | 1 + src/common/compat_time.c | 15 +++++++++++++++ src/common/compat_time.h | 3 +++ 4 files changed, 24 insertions(+)

1 0

[tor/master] Split client-side get_rend_circ into two functions.
by nickm＠torproject.org 11 Dec '17

11 Dec '17

commit 855982728085cc9497c70c2b74d8d58b62cab1a1 Author: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> Date: Fri Dec 8 18:10:07 2017 +0100 Split client-side get_rend_circ into two functions. Split hs_circuitmap_get_rend_circ_client_side(). One returns only established circuits (hs_circuitmap_get_established_rend_circ_client_side()) and the other returns all kinds of circuits. Fixes #23459 Signed-off-by: Fernando Fernandez Mancera <ffernandezmancera(a)gmail.com> --- changes/ticket23459 | 4 ++++ src/or/hs_circuitmap.c | 36 ++++++++++++++++++++++++++++++------ src/or/hs_circuitmap.h | 2 ++ src/or/hs_client.c | 3 ++- 4 files changed, 38 insertions(+), 7 deletions(-) diff --git a/changes/ticket23459 b/changes/ticket23459 new file mode 100644 index 000000000..a6452e4ee --- /dev/null +++ b/changes/ticket23459 @@ -0,0 +1,4 @@ + o Code simplification and refactoring (circuit rendezvous): + - Split get rendezvous circuit on client side on two different functions. + One that returns only established circuits and another that returns all + kinds of circuits. Closes ticket 23459. diff --git a/src/or/hs_circuitmap.c b/src/or/hs_circuitmap.c index 97d6053e9..9d3e37073 100644 --- a/src/or/hs_circuitmap.c +++ b/src/or/hs_circuitmap.c @@ -428,30 +428,54 @@ hs_circuitmap_get_rend_circ_client_side(const uint8_t *cookie) { origin_circuit_t *circ = NULL; - circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE, - REND_TOKEN_LEN, cookie, - CIRCUIT_PURPOSE_C_REND_READY); + circ = hs_circuitmap_get_established_rend_circ_client_side(cookie); if (circ) { return circ; } circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE, REND_TOKEN_LEN, cookie, - CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED); + CIRCUIT_PURPOSE_C_ESTABLISH_REND); + return circ; +} + +/* Public function: Return client-side established rendezvous circuit with + * rendezvous <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. + * + * Return NULL if no such circuit is found in the circuitmap. */ +origin_circuit_t * +hs_circuitmap_get_established_rend_circ_client_side(const uint8_t *cookie) +{ + origin_circuit_t *circ = NULL; + + circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE, + REND_TOKEN_LEN, cookie, + CIRCUIT_PURPOSE_C_REND_READY); if (circ) { return circ; } circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE, REND_TOKEN_LEN, cookie, - CIRCUIT_PURPOSE_C_REND_JOINED); + CIRCUIT_PURPOSE_C_REND_READY_INTRO_ACKED); if (circ) { return circ; } circ = hs_circuitmap_get_origin_circuit(HS_TOKEN_REND_CLIENT_SIDE, REND_TOKEN_LEN, cookie, - CIRCUIT_PURPOSE_C_ESTABLISH_REND); + CIRCUIT_PURPOSE_C_REND_JOINED); return circ; } diff --git a/src/or/hs_circuitmap.h b/src/or/hs_circuitmap.h index 43b2947c1..9e653480b 100644 --- a/src/or/hs_circuitmap.h +++ b/src/or/hs_circuitmap.h @@ -45,6 +45,8 @@ struct origin_circuit_t * hs_circuitmap_get_rend_circ_service_side(const uint8_t *cookie); struct origin_circuit_t * hs_circuitmap_get_rend_circ_client_side(const uint8_t *cookie); +struct origin_circuit_t * +hs_circuitmap_get_established_rend_circ_client_side(const uint8_t *cookie); void hs_circuitmap_register_intro_circ_v2_service_side( struct origin_circuit_t *circ, diff --git a/src/or/hs_client.c b/src/or/hs_client.c index 9ac653c72..0dea0bb8c 100644 --- a/src/or/hs_client.c +++ b/src/or/hs_client.c @@ -940,7 +940,8 @@ handle_introduce_ack_success(origin_circuit_t *intro_circ) /* Get the rendezvous circuit for this rendezvous cookie. */ uint8_t *rendezvous_cookie = intro_circ->hs_ident->rendezvous_cookie; - rend_circ = hs_circuitmap_get_rend_circ_client_side(rendezvous_cookie); + rend_circ = + hs_circuitmap_get_established_rend_circ_client_side(rendezvous_cookie); if (rend_circ == NULL) { log_warn(LD_REND, "Can't find any rendezvous circuit. Stopping"); goto end;

1 0