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

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 30 Nov '17

30 Nov '17

commit 8d2cea455a264751ef656a3feb73407ad930c0f9 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 30 16:15:51 2017 +0000 Update translations for https_everywhere_completed --- es_MX/https-everywhere.dtd | 36 +++++++----------------------------- 1 file changed, 7 insertions(+), 29 deletions(-) diff --git a/es_MX/https-everywhere.dtd b/es_MX/https-everywhere.dtd index af8aa3c50..443d0815c 100644 --- a/es_MX/https-everywhere.dtd +++ b/es_MX/https-… [View More]everywhere.dtd @@ -1,43 +1,23 @@ -<!ENTITY https-everywhere.about.title "Sobre HTTPS Universal"> +<!ENTITY https-everywhere.about.title "Sobre HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_name "HTTPS Everywhere"> <!ENTITY https-everywhere.about.ext_description "Cifra la Red! Automáticamente utiliza seguridades HTTPS en multiples sitios."> <!ENTITY https-everywhere.about.version "Versión"> -<!ENTITY https-everywhere.about.created_by "Creado por"> -<!ENTITY https-everywhere.about.and ", y"> -<!ENTITY https-everywhere.about.librarians "Bibliotecarios de conjuntos de reglas"> <!ENTITY https-everywhere.about.add_new_rule "Añade Nueva Regla"> -<!ENTITY https-everywhere.about.thanks "Gracias a"> -<!ENTITY https-everywhere.about.many_contributors "Muchisimos contribuidores, incluyendo "> -<!ENTITY https-everywhere.about.noscript "Ademas, las porciones de HTTPS Everywhere se basan en el codijo de NoScript escrito por Giorgio Maone y otoros. ¡Estamos muy agredcidos para su trabajo excellente!"> -<!ENTITY https-everywhere.about.contribute "Si te gusta HTTPS Everywhere, podrias considerar"> -<!ENTITY https-everywhere.about.donate_tor "Donar a Tor"> -<!ENTITY https-everywhere.about.tor_lang_code "en"> -<!ENTITY https-everywhere.about.or "o"> -<!ENTITY https-everywhere.about.donate_eff "Donando a EFF"> <!ENTITY https-everywhere.menu.donate_eff_imperative "Dona a EFF"> -<!ENTITY https-everywhere.menu.about "Sobre HTTPS Everywhere"> <!ENTITY https-everywhere.menu.observatory "Preferencias del Observatorio SSL"> <!ENTITY https-everywhere.menu.globalEnable "Activar HTTPS Everywhere"> -<!ENTITY https-everywhere.menu.globalDisable "Desactivar HTTPS Everywhere"> <!ENTITY https-everywhere.menu.blockUnencryptedRequests "Bloquear todos los pedidos no-encriptados"> <!ENTITY https-everywhere.menu.showCounter "Enseña contador "> <!ENTITY https-everywhere.menu.viewAllRules "Ver todo las reglas"> -<!ENTITY https-everywhere.prefs.title "Preferencias de HTTPS Everywhere"> -<!ENTITY https-everywhere.prefs.enable_all "Habilitar Todos"> -<!ENTITY https-everywhere.prefs.disable_all "Desactivar Todos"> +<!ENTITY https-everywhere.options.generalSettings "Configuración General"> +<!ENTITY https-everywhere.options.importSettings "Importar Configuración"> +<!ENTITY https-everywhere.options.import "Importar"> +<!ENTITY https-everywhere.options.imported "Tus configuraciónes han sido importadas."> + +<!ENTITY https-everywhere.prefs.export_settings "Exportar configuraciónes."> <!ENTITY https-everywhere.prefs.reset_defaults "Restaurar a Valores Predeterminados"> -<!ENTITY https-everywhere.prefs.search "Busqueda"> -<!ENTITY https-everywhere.prefs.site "Sitio"> -<!ENTITY https-everywhere.prefs.notes "Notas"> -<!ENTITY https-everywhere.prefs.list_caption "Cuales reglas de redirection de HTTPS deberían ser aplicadas?"> -<!ENTITY https-everywhere.prefs.enabled "Habilitado"> -<!ENTITY https-everywhere.prefs.ruleset_howto "Tu pueudes aprender como a escribir tus propios conjuntos de reglas (para añadir apoyo para los otros sitios de web)"> -<!ENTITY https-everywhere.prefs.here_link "aqui"> -<!ENTITY https-everywhere.prefs.toggle "Alternar"> -<!ENTITY https-everywhere.prefs.reset_default "Restaurar a Estado Predeterminado"> -<!ENTITY https-everywhere.prefs.view_xml_source "Ver fuente XML"> <!ENTITY https-everywhere.chrome.stable_rules "Reglas Estables"> <!ENTITY https-everywhere.chrome.stable_rules_description "A fuerza utilizar conexiones encriptado para estas sitios de web"> @@ -53,5 +33,3 @@ <!ENTITY https-everywhere.chrome.regex "Regex coincidente"> <!ENTITY https-everywhere.chrome.redirect_to "Redirigir a "> <!ENTITY https-everywhere.chrome.status_cancel_button "Cancelar"> - - [View Less]

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 30 Nov '17

30 Nov '17

commit 364f6d83dcb3670b21628cb710dd78967de12602 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 30 16:15:40 2017 +0000 Update translations for https_everywhere --- es_MX/https-everywhere.dtd | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/es_MX/https-everywhere.dtd b/es_MX/https-everywhere.dtd index d5eea278d..443d0815c 100644 --- a/es_MX/https-everywhere.dtd +++ b/es_MX/https-everywhere.dtd @@ -1,4 +1,4 @@ -<!ENTITY … [View More]

1 0

[translation/tails-greeter-2] Update translations for tails-greeter-2
by translation＠torproject.org 30 Nov '17

30 Nov '17

commit 4049eece212862d15480314cada2ed620bd5d302 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 30 15:20:23 2017 +0000 Update translations for tails-greeter-2 --- ar/ar.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ar/ar.po b/ar/ar.po index 8c6b8fa2c..d4d49fc80 100644 --- a/ar/ar.po +++ b/ar/ar.po @@ -10,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-15 21:21+0200\n" "PO-Revision-Date: YEAR-… [View More]

1 0

[translation/torbirdy] Update translations for torbirdy
by translation＠torproject.org 30 Nov '17

30 Nov '17

commit 588e3a090e565cd961dc091ad29ace6e9231f77d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 30 15:16:16 2017 +0000 Update translations for torbirdy --- bn/torbirdy.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn/torbirdy.dtd b/bn/torbirdy.dtd index 3a9547198..b66580ad1 100644 --- a/bn/torbirdy.dtd +++ b/bn/torbirdy.dtd @@ -17,7 +17,7 @@ <!ENTITY torbirdy.prefs.testproxy.button "Test Proxy Settings"> <!ENTITY … [View More]

1 0

[translation/tor-messenger-prefsdtd] Update translations for tor-messenger-prefsdtd
by translation＠torproject.org 30 Nov '17

30 Nov '17

commit ffc84a1c79f83965dbba68342f0117330ba375d5 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 30 14:19:55 2017 +0000 Update translations for tor-messenger-prefsdtd --- bn/prefs.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bn/prefs.dtd b/bn/prefs.dtd index ace40b978..04a8bb0ac 100644 --- a/bn/prefs.dtd +++ b/bn/prefs.dtd @@ -12,7 +12,7 @@ <!ENTITY prefs.introSettings "These settings apply to all one-to-one conversations."… [View More]

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 30 Nov '17

30 Nov '17

commit 7a19979fb6b1fee4e2f7e4c7eddc396a89c35015 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Nov 30 14:17:07 2017 +0000 Update translations for tails-misc --- bn.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bn.po b/bn.po index f5d630a2f..fa67d43e6 100644 --- a/bn.po +++ b/bn.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2017-09-13 20:10+0200\n" -"PO-… [View More]

1 0

[tor/master] Add fast paths to channel_rsa_id_group_set_badness, #24119
by nickm＠torproject.org 30 Nov '17

30 Nov '17

commit 2cda005ac49dcf02d2cfe358f8c75129a0f2f3bf Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> Date: Sun Nov 5 09:40:22 2017 -0500 Add fast paths to channel_rsa_id_group_set_badness, #24119 --- src/or/channel.c | 12 +++++++++++- src/or/connection_or.c | 43 +++++++++++++++++++++++++++++++------------ src/or/connection_or.h | 3 +++ 3 files changed, 45 insertions(+), 13 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index 0b5a7fde9..acd890c72 100644 --- a/… [View More]src/or/channel.c +++ b/src/or/channel.c @@ -4734,7 +4734,17 @@ static void channel_rsa_id_group_set_badness(struct channel_list_s *lst, int force) { /*XXXX This function should really be about channels. 15056 */ - channel_t *chan; + channel_t *chan = TOR_LIST_FIRST(lst); + + if (!chan) + return; + + /* if there is only one channel, don't bother looping */ + if (PREDICT_LIKELY(!TOR_LIST_NEXT(chan, next_with_same_id))) { + connection_or_single_set_badness_( + time(NULL), BASE_CHAN_TO_TLS(chan)->conn, force); + return; + } /* First, get a minimal list of the ed25519 identites */ smartlist_t *ed_identities = smartlist_new(); diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 7af1f2b64..fdf1b2ebb 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -965,6 +965,36 @@ connection_or_mark_bad_for_new_circs(or_connection_t *or_conn) * too old for new circuits? */ #define TIME_BEFORE_OR_CONN_IS_TOO_OLD (60*60*24*7) +/** Expire an or_connection if it is too old. Helper for + * connection_or_group_set_badness_ and fast path for + * channel_rsa_id_group_set_badness. + * + * Returns 1 if the connection was already expired, else 0. + */ +int +connection_or_single_set_badness_(time_t now, + or_connection_t *or_conn, + int force) +{ + /* XXXX this function should also be about channels? */ + if (or_conn->base_.marked_for_close || + connection_or_is_bad_for_new_circs(or_conn)) + return 1; + + if (force || + or_conn->base_.timestamp_created + TIME_BEFORE_OR_CONN_IS_TOO_OLD + < now) { + log_info(LD_OR, + "Marking OR conn to %s:%d as too old for new circuits " + "(fd "TOR_SOCKET_T_FORMAT", %d secs old).", + or_conn->base_.address, or_conn->base_.port, or_conn->base_.s, + (int)(now - or_conn->base_.timestamp_created)); + connection_or_mark_bad_for_new_circs(or_conn); + } + + return 0; +} + /** Given a list of all the or_connections with a given * identity, set elements of that list as is_bad_for_new_circs as * appropriate. Helper for connection_or_set_bad_connections(). @@ -995,19 +1025,8 @@ connection_or_group_set_badness_(smartlist_t *group, int force) /* Pass 1: expire everything that's old, and see what the status of * everything else is. */ SMARTLIST_FOREACH_BEGIN(group, or_connection_t *, or_conn) { - if (or_conn->base_.marked_for_close || - connection_or_is_bad_for_new_circs(or_conn)) + if (connection_or_single_set_badness_(now, or_conn, force)) continue; - if (force || - or_conn->base_.timestamp_created + TIME_BEFORE_OR_CONN_IS_TOO_OLD - < now) { - log_info(LD_OR, - "Marking OR conn to %s:%d as too old for new circuits " - "(fd "TOR_SOCKET_T_FORMAT", %d secs old).", - or_conn->base_.address, or_conn->base_.port, or_conn->base_.s, - (int)(now - or_conn->base_.timestamp_created)); - connection_or_mark_bad_for_new_circs(or_conn); - } if (connection_or_is_bad_for_new_circs(or_conn)) { ++n_old; diff --git a/src/or/connection_or.h b/src/or/connection_or.h index ee66b7c52..644df5c2c 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -112,6 +112,9 @@ void var_cell_free(var_cell_t *cell); #define MIN_LINK_PROTO_FOR_CHANNEL_PADDING 5 #define MAX_LINK_PROTO MIN_LINK_PROTO_FOR_CHANNEL_PADDING +int connection_or_single_set_badness_(time_t now, + or_connection_t *or_conn, + int force); void connection_or_group_set_badness_(smartlist_t *group, int force); #ifdef TOR_UNIT_TESTS [View Less]

1 0

[tor/master] Simplify channel_rsa_id_group_set_badness, #24119
by nickm＠torproject.org 30 Nov '17

30 Nov '17

commit f1e8e549646361b85ef0676c108040333fd021f8 Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> Date: Sat Nov 4 22:23:40 2017 -0400 Simplify channel_rsa_id_group_set_badness, #24119 --- src/or/channel.c | 58 ++++++++++++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 25 deletions(-) diff --git a/src/or/channel.c b/src/or/channel.c index acd890c72..7590ba8a5 100644 --- a/src/or/channel.c +++ b/src/or/channel.c @@ -4726,6 +4726,16 @@ … [View More]channel_set_circid_type,(channel_t *chan, } } +static int +channel_sort_by_ed25519_identity(const void **a_, const void **b_) +{ + const channel_t *a = *a_, + *b = *b_; + return fast_memcmp(&a->ed25519_identity.pubkey, + &b->ed25519_identity.pubkey, + sizeof(a->ed25519_identity.pubkey)); +} + /** Helper for channel_update_bad_for_new_circs(): Perform the * channel_update_bad_for_new_circs operation on all channels in <b>lst</b>, * all of which MUST have the same RSA ID. (They MAY have different @@ -4746,42 +4756,40 @@ channel_rsa_id_group_set_badness(struct channel_list_s *lst, int force) return; } - /* First, get a minimal list of the ed25519 identites */ - smartlist_t *ed_identities = smartlist_new(); + smartlist_t *channels = smartlist_new(); + TOR_LIST_FOREACH(chan, lst, next_with_same_id) { - uint8_t *id_copy = - tor_memdup(&chan->ed25519_identity.pubkey, DIGEST256_LEN); - smartlist_add(ed_identities, id_copy); + if (BASE_CHAN_TO_TLS(chan)->conn) { + smartlist_add(channels, chan); + } } - smartlist_sort_digests256(ed_identities); - smartlist_uniq_digests256(ed_identities); - /* Now, for each Ed identity, build a smartlist and find the best entry on - * it. */ + smartlist_sort(channels, channel_sort_by_ed25519_identity); + + const ed25519_public_key_t *common_ed25519_identity = NULL; + /* it would be more efficient to do a slice, but this case is rare */ smartlist_t *or_conns = smartlist_new(); - SMARTLIST_FOREACH_BEGIN(ed_identities, const uint8_t *, ed_id) { - TOR_LIST_FOREACH(chan, lst, next_with_same_id) { - channel_tls_t *chantls = BASE_CHAN_TO_TLS(chan); - if (tor_memneq(ed_id, &chan->ed25519_identity.pubkey, DIGEST256_LEN)) - continue; - or_connection_t *orconn = chantls->conn; - if (orconn) { - tor_assert(orconn->chan == chantls); - smartlist_add(or_conns, orconn); - } + SMARTLIST_FOREACH_BEGIN(channels, channel_t *, channel) { + if (!common_ed25519_identity) + common_ed25519_identity = &channel->ed25519_identity; + + if (! ed25519_pubkey_eq(&channel->ed25519_identity, + common_ed25519_identity)) { + connection_or_group_set_badness_(or_conns, force); + smartlist_clear(or_conns); + common_ed25519_identity = &channel->ed25519_identity; } - connection_or_group_set_badness_(or_conns, force); - smartlist_clear(or_conns); - } SMARTLIST_FOREACH_END(ed_id); + smartlist_add(or_conns, BASE_CHAN_TO_TLS(channel)->conn); + } SMARTLIST_FOREACH_END(channel); + + connection_or_group_set_badness_(or_conns, force); /* XXXX 15056 we may want to do something special with connections that have * no set Ed25519 identity! */ smartlist_free(or_conns); - - SMARTLIST_FOREACH(ed_identities, uint8_t *, ed_id, tor_free(ed_id)); - smartlist_free(ed_identities); + smartlist_free(channels); } /** Go through all the channels (or if <b>digest</b> is non-NULL, just [View Less]

1 0

[tor/master] Add changes/bug24119
by nickm＠torproject.org 30 Nov '17

30 Nov '17

commit 49a4961dad561282b830c82866c20bab0aa1fdd3 Author: Alex Xu (Hello71) <alex_y_xu(a)yahoo.ca> Date: Fri Nov 24 11:21:04 2017 -0500 Add changes/bug24119 --- changes/bug24119 | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/changes/bug24119 b/changes/bug24119 new file mode 100644 index 000000000..501425760 --- /dev/null +++ b/changes/bug24119 @@ -0,0 +1,4 @@ + o Code simplification and refactoring: + - Rewrite channel_rsa_id_group_set_badness to reduce temporary memory … [View More]

1 0

[tor/master] Merge branch 'bug24119_squashed'
by nickm＠torproject.org 30 Nov '17

30 Nov '17

commit 1c7121be544ab5a15d8aed6fe3c9c31026eedc02 Merge: bef461ef1 49a4961da Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Nov 30 08:00:34 2017 -0500 Merge branch 'bug24119_squashed' changes/bug24119 | 4 +++ src/or/channel.c | 70 +++++++++++++++++++++++++++++++------------------- src/or/connection_or.c | 43 ++++++++++++++++++++++--------- src/or/connection_or.h | 3 +++ 4 files changed, 82 insertions(+), 38 deletions(-)

1 0