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

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 18 Jan '17

18 Jan '17

commit 036565649d03649c71375864e69936d776464fda Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 17:45:13 2017 +0000 Update translations for torcheck --- da/torcheck.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/da/torcheck.po b/da/torcheck.po index 02aebac..ffce0bc 100644 --- a/da/torcheck.po +++ b/da/torcheck.po @@ -13,7 +13,7 @@ msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2017-01-18 11:51+0000\n" +"PO-Revision-Date: 2017-01-18 17:41+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" @@ -30,7 +30,7 @@ msgid "" "Please refer to the <a href=\"https://www.torproject.org/\">Tor website</a> " "for further information about using Tor safely. You are now free to browse " "the Internet anonymously." -msgstr "Der henvises til <a href=\"https://www.torproject.org/\">Tor websiden</a> for yderligere informationer om sikker brug af Tor. Du kan nu frit browse anonymt på internettet." +msgstr "Der henvises til <a href=\"https://www.torproject.org/\">Tor-webstedet</a> for yderligere informationer om sikker brug af Tor. Du kan nu frit browse anonymt på internettet." msgid "There is a security update available for Tor Browser." msgstr "Der er en sikkerhedsopdatering tilgængelig for Tor Browser."

1 0

[translation/bridgedb_completed] Update translations for bridgedb_completed
by translation＠torproject.org 18 Jan '17

18 Jan '17

commit bddfba556e6f88707be4b8ffa03853c1c42c7d05 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 17:45:10 2017 +0000 Update translations for bridgedb_completed --- da/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index 3bec006..22bfd09 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-01-18 11:48+0000\n" +"PO-Revision-Date: 2017-01-18 17:23+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n"

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 18 Jan '17

18 Jan '17

commit a303832c49d6f0d0e9e7f8b42f8710760acda189 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Jan 18 17:45:03 2017 +0000 Update translations for bridgedb --- da/LC_MESSAGES/bridgedb.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po index 3bec006..22bfd09 100644 --- a/da/LC_MESSAGES/bridgedb.po +++ b/da/LC_MESSAGES/bridgedb.po @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" "POT-Creation-Date: 2015-07-25 03:40+0000\n" -"PO-Revision-Date: 2017-01-18 11:48+0000\n" +"PO-Revision-Date: 2017-01-18 17:23+0000\n" "Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n"

1 0

[tor/master] Refactor duplicated extrainfo checks into a common macro.
by nickm＠torproject.org 18 Jan '17

18 Jan '17

commit 46ef32ba222191a3be27abea2783b21aa28cf259 Author: Alexander Færøy <ahf(a)0x90.dk> Date: Thu Jan 12 01:12:29 2017 +0100 Refactor duplicated extrainfo checks into a common macro. This patch refactors duplicated code, to check if a given router supports fetching the extra-info document, into a common macro called SKIP_MISSING_TRUSTED_EXTRAINFO. --- src/or/routerlist.c | 35 +++++++++++++++++++++++------------ 1 file changed, 23 insertions(+), 12 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index e6752e6..afa6181 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1935,6 +1935,21 @@ router_picked_poor_directory_log(const routerstatus_t *rs) } \ STMT_END +/* Common code used in the loop within router_pick_directory_server_impl and + * router_pick_trusteddirserver_impl. + * + * Check if the given <b>identity</b> supports extrainfo. If not, skip further + * checks. + */ +#define SKIP_MISSING_TRUSTED_EXTRAINFO(type, identity) \ + STMT_BEGIN \ + int is_trusted_extrainfo = router_digest_is_trusted_dir_type( \ + (identity), EXTRAINFO_DIRINFO); \ + if (((type) & EXTRAINFO_DIRINFO) && \ + !router_supports_extrainfo((identity), is_trusted_extrainfo)) \ + continue; \ + STMT_END + /* When iterating through the routerlist, can OR address/port preference * and reachability checks be skipped? */ @@ -2007,7 +2022,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, /* Find all the running dirservers we know about. */ SMARTLIST_FOREACH_BEGIN(nodelist_get_list(), const node_t *, node) { - int is_trusted, is_trusted_extrainfo; + int is_trusted; int is_overloaded; const routerstatus_t *status = node->rs; const country_t country = node->country; @@ -2018,12 +2033,9 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, continue; if (requireother && router_digest_is_me(node->identity)) continue; - is_trusted = router_digest_is_trusted_dir(node->identity); - is_trusted_extrainfo = router_digest_is_trusted_dir_type( - node->identity, EXTRAINFO_DIRINFO); - if ((type & EXTRAINFO_DIRINFO) && - !router_supports_extrainfo(node->identity, is_trusted_extrainfo)) - continue; + + SKIP_MISSING_TRUSTED_EXTRAINFO(type, node->identity); + #ifdef ENABLE_LEGACY_GUARD_ALGORITHM /* Don't make the same node a guard twice */ if (for_guard && is_node_used_as_guard(node)) { @@ -2051,6 +2063,7 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, } is_overloaded = status->last_dir_503_at + DIR_503_TIMEOUT > now; + is_trusted = router_digest_is_trusted_dir(node->identity); /* Clients use IPv6 addresses if the server has one and the client * prefers IPv6. @@ -2182,11 +2195,9 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, if (!d->is_running) continue; if ((type & d->type) == 0) continue; - int is_trusted_extrainfo = router_digest_is_trusted_dir_type( - d->digest, EXTRAINFO_DIRINFO); - if ((type & EXTRAINFO_DIRINFO) && - !router_supports_extrainfo(d->digest, is_trusted_extrainfo)) - continue; + + SKIP_MISSING_TRUSTED_EXTRAINFO(type, d->digest); + if (requireother && me && router_digest_is_me(d->digest)) continue; if (try_excluding &&

1 0

[tor/master] Generalize router_is_already_dir_fetching_{rs, ds}.
by nickm＠torproject.org 18 Jan '17

18 Jan '17

commit 0ff9ea2afd68d7baca70a21b598b1114a853f83c Author: Alexander Færøy <ahf(a)0x90.dk> Date: Thu Jan 12 00:35:44 2017 +0100 Generalize router_is_already_dir_fetching_{rs,ds}. This patch generalizes the two functions router_is_already_dir_fetching_rs and router_is_already_dir_fetching_ds into a single function, router_is_already_dir_fetching_, by lifting the passing of the IPv4 & IPv6 addresses and the directory port number to the caller. --- src/or/routerlist.c | 56 ++++++++++++++++++++--------------------------------- 1 file changed, 21 insertions(+), 35 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 78e7d02..e6752e6 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1826,43 +1826,24 @@ router_is_already_dir_fetching(const tor_addr_port_t *ap, int serverdesc, return 0; } -/* Check if we already have a directory fetch from ds, for serverdesc - * (including extrainfo) or microdesc documents. - * If so, return 1, if not, return 0. - */ -static int -router_is_already_dir_fetching_ds(const dir_server_t *ds, - int serverdesc, - int microdesc) -{ - tor_addr_port_t ipv4_dir_ap, ipv6_dir_ap; - - /* Assume IPv6 DirPort is the same as IPv4 DirPort */ - tor_addr_from_ipv4h(&ipv4_dir_ap.addr, ds->addr); - ipv4_dir_ap.port = ds->dir_port; - tor_addr_copy(&ipv6_dir_ap.addr, &ds->ipv6_addr); - ipv6_dir_ap.port = ds->dir_port; - - return (router_is_already_dir_fetching(&ipv4_dir_ap, serverdesc, microdesc) - || router_is_already_dir_fetching(&ipv6_dir_ap, serverdesc, microdesc)); -} - -/* Check if we already have a directory fetch from rs, for serverdesc - * (including extrainfo) or microdesc documents. +/* Check if we already have a directory fetch from the ipv4 or ipv6 + * router, for serverdesc (including extrainfo) or microdesc documents. * If so, return 1, if not, return 0. */ static int -router_is_already_dir_fetching_rs(const routerstatus_t *rs, - int serverdesc, - int microdesc) +router_is_already_dir_fetching_(uint32_t ipv4_addr, + const tor_addr_t *ipv6_addr, + uint16_t dir_port, + int serverdesc, + int microdesc) { tor_addr_port_t ipv4_dir_ap, ipv6_dir_ap; /* Assume IPv6 DirPort is the same as IPv4 DirPort */ - tor_addr_from_ipv4h(&ipv4_dir_ap.addr, rs->addr); - ipv4_dir_ap.port = rs->dir_port; - tor_addr_copy(&ipv6_dir_ap.addr, &rs->ipv6_addr); - ipv6_dir_ap.port = rs->dir_port; + tor_addr_from_ipv4h(&ipv4_dir_ap.addr, ipv4_addr); + ipv4_dir_ap.port = dir_port; + tor_addr_copy(&ipv6_dir_ap.addr, ipv6_addr); + ipv6_dir_ap.port = dir_port; return (router_is_already_dir_fetching(&ipv4_dir_ap, serverdesc, microdesc) || router_is_already_dir_fetching(&ipv6_dir_ap, serverdesc, microdesc)); @@ -2060,9 +2041,11 @@ router_pick_directory_server_impl(dirinfo_type_t type, int flags, continue; } - if (router_is_already_dir_fetching_rs(status, - no_serverdesc_fetching, - no_microdesc_fetching)) { + if (router_is_already_dir_fetching_(status->addr, + &status->ipv6_addr, + status->dir_port, + no_serverdesc_fetching, + no_microdesc_fetching)) { ++n_busy; continue; } @@ -2213,8 +2196,11 @@ router_pick_trusteddirserver_impl(const smartlist_t *sourcelist, continue; } - if (router_is_already_dir_fetching_ds(d, no_serverdesc_fetching, - no_microdesc_fetching)) { + if (router_is_already_dir_fetching_(d->addr, + &d->ipv6_addr, + d->dir_port, + no_serverdesc_fetching, + no_microdesc_fetching)) { ++n_busy; continue; }

1 0

[tor/master] Merge branch 'ahf_bugs_17847_2_squashed'
by nickm＠torproject.org 18 Jan '17

18 Jan '17

commit fa00f2dce5a93164e36860794b75c595067c2f63 Merge: b6dce6c 46ef32b Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 11:04:58 2017 -0500 Merge branch 'ahf_bugs_17847_2_squashed' src/or/routerlist.c | 91 ++++++++++++++++++++++++++--------------------------- 1 file changed, 44 insertions(+), 47 deletions(-)

1 0

[tor/master] Correctly maintain circuits in circuits_pending_other_guards().
by nickm＠torproject.org 18 Jan '17

18 Jan '17

commit 1bc440eda476e3d270aa5fe1810a3d1d4778d725 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Jan 17 13:26:59 2017 +0200 Correctly maintain circuits in circuits_pending_other_guards(). --- changes/bug21142 | 4 ++++ src/or/circuitlist.c | 3 +++ 2 files changed, 7 insertions(+) diff --git a/changes/bug21142 b/changes/bug21142 new file mode 100644 index 0000000..e232f43 --- /dev/null +++ b/changes/bug21142 @@ -0,0 +1,4 @@ + o Minor bugfixes (client, guards): + - Fix bug where Tor would think that there are circuits waiting for better + guards even though those circuits have been freed. Fixes bug #21142; + bugfix on 0.3.0.1-alpha. diff --git a/src/or/circuitlist.c b/src/or/circuitlist.c index 2d2dbcc..54a7db9 100644 --- a/src/or/circuitlist.c +++ b/src/or/circuitlist.c @@ -1858,6 +1858,9 @@ circuit_about_to_free(circuit_t *circ) if (circuits_pending_chans) smartlist_remove(circuits_pending_chans, circ); } + if (circuits_pending_other_guards) { + smartlist_remove(circuits_pending_other_guards, circ); + } if (CIRCUIT_IS_ORIGIN(circ)) { control_event_circuit_status(TO_ORIGIN_CIRCUIT(circ), (circ->state == CIRCUIT_STATE_OPEN ||

1 0

[tor/master] Merge remote-tracking branch 'asn/bug21142'
by nickm＠torproject.org 18 Jan '17

18 Jan '17

commit b6dce6cfec20f2e23bf60533aa0e2f23fc1daac5 Merge: d31209a 1bc440e Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 18 10:44:35 2017 -0500 Merge remote-tracking branch 'asn/bug21142' changes/bug21142 | 4 ++++ src/or/circuitlist.c | 3 +++ 2 files changed, 7 insertions(+)

1 0

[torspec/master] add explanation of KEYID(A) function
by nickm＠torproject.org 18 Jan '17

18 Jan '17

commit 0e1530ce212ae0de6923980d67f1b1c6abf1d94a Author: Kacper Kołodziej <kacper(a)kolodziej.in> Date: Sun Jan 15 16:53:32 2017 +0100 add explanation of KEYID(A) function based on proposal #216, where KEYID(A) = A --- tor-spec.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/tor-spec.txt b/tor-spec.txt index f45604b..f727d51 100644 --- a/tor-spec.txt +++ b/tor-spec.txt @@ -915,6 +915,7 @@ see tor-design.pdf. KEYGEN() = The curve25519 key generation algorithm, returning a private/public keypair. m_expand = PROTOID | ":key_expand" + KEYID(A) = A To perform the handshake, the client needs to know an identity key digest for the server, and an ntor onion key (a curve25519 public

1 0

[torspec/master] prop224: Fix time period example
by nickm＠torproject.org 18 Jan '17

18 Jan '17

commit c9ca45266ac57d305629501545348c35437c27bd Author: Nicolas Braud-Santoni <nicolas(a)braud-santoni.eu> Date: Sat Jan 14 16:11:31 2017 +0100 prop224: Fix time period example --- proposals/224-rend-spec-ng.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/224-rend-spec-ng.txt b/proposals/224-rend-spec-ng.txt index 94ad1f8..53a1479 100644 --- a/proposals/224-rend-spec-ng.txt +++ b/proposals/224-rend-spec-ng.txt @@ -723,7 +723,7 @@ Table of contents: in time period number 16903. Specifically, time period #16903 began 16903*1440*60 + (12*60*60) seconds - after the epoch at 2016-04-12 12:00 UTC, and ended at (16904+1)*1500*60 + + after the epoch at 2016-04-12 12:00 UTC, and ended at 16904*1440*60 + (12*60*60) seconds after the epoch at 2016-04-13 12:00 UTC. 2.2.2. When to publish a hidden service descriptor [WHEN-HSDESC]

1 0