July 2016 - tor-commits - lists.torproject.org

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 01 Jul '16

01 Jul '16

commit 85b2afae83b49b1114d38e2d45a803679c565fbc Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 1 14:45:32 2016 +0000 Update translations for https_everywhere_completed --- fr_CA/ssl-observatory.dtd | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fr_CA/ssl-observatory.dtd b/fr_CA/ssl-observatory.dtd index e8eddbb..7295df7 100644 --- a/fr_CA/ssl-observatory.dtd +++ b/fr_CA/ssl-observatory.dtd @@ -45,10 +45,10 @@ un réseau d'entreprise très intrusif:"> "Cette option ira chercher et enverra le « numéro de système autonome » de votre réseau. Ceci nous aidera à localiser les attaques contre HTTPS, et à déterminer si nous avons des observations à partir de réseaux dans des lieux comme l'Iran et la Syrie où les attaques sont comparativement fréquentes."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Afficher un avertissement si l'observatoire détecte un certificat révoqué ignoré par votre navigateur"> +"Afficher un avertissement si l'observatoire détecte un certificat révoqué mais ignoré par votre navigateur"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"Ceci comparera les certificats transmis aux listes de révocation des certificats. Malheureusement nous ne pouvons pas garantir que nous signalerons tous les certificats révoqués, mais si vous voyez un avertissement, il y a de bonnes chances que quelque ne va pas."> +"Ceci comparera les certificats transmis aux listes de révocation des certificats. Malheureusement, nous ne pouvons pas garantir que nous signalerons tous les certificats révoqués, mais si vous voyez un avertissement, il y a de bonnes chances que quelque chose ne va pas."> <!ENTITY ssl-observatory.prefs.done "Fait"> @@ -65,10 +65,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"Par exemple, si vous visitez https://www.quelquechose.com, le certificat reçu -par l'observatoire indiquera que quelqu'un a visité www.quelquechose.com, -mais pas qui a visité le site, ou quelle page spécifique a été regardée. Passez -votre souris sur les options pour plus d'informations:"> +"Par exemple, si vous visitez https://www.quelquechose.com, le certificat reçu par l'observatoire indiquera que quelqu'un a visité www.quelquechose.com, mais pas l'identité de la personne qui a visité le site ni quelle page particulière a été regardée. Passez votre souris sur les options pour plus d'informations :"> <!ENTITY ssl-observatory.prefs.hide "Cacher les options avancées"> @@ -79,7 +76,7 @@ votre souris sur les options pour plus d'informations:"> "Nous essaierons encore de garder les données anonymes, mais cette option est moins sécuritaire"> <!ENTITY ssl-observatory.prefs.priv_dns -"Envoyer et vérifier les certificats des les noms de DNS non-publics "> +"Envoyer et vérifier les certificats des noms de DNS non-publics "> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip "Au moins que cette option est activée, l'observatoire n'enregistrera pas les certificats pour les noms qu'il ne peut pas résoudre par le système DNS.">

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 01 Jul '16

01 Jul '16

commit fed94d7ffe76545db74b7c6ca7d27c578d15fb08 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Jul 1 14:45:27 2016 +0000 Update translations for https_everywhere --- fr_CA/ssl-observatory.dtd | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/fr_CA/ssl-observatory.dtd b/fr_CA/ssl-observatory.dtd index e8eddbb..7295df7 100644 --- a/fr_CA/ssl-observatory.dtd +++ b/fr_CA/ssl-observatory.dtd @@ -45,10 +45,10 @@ un réseau d'entreprise très intrusif:"> "Cette option ira chercher et enverra le « numéro de système autonome » de votre réseau. Ceci nous aidera à localiser les attaques contre HTTPS, et à déterminer si nous avons des observations à partir de réseaux dans des lieux comme l'Iran et la Syrie où les attaques sont comparativement fréquentes."> <!ENTITY ssl-observatory.prefs.show_cert_warning -"Afficher un avertissement si l'observatoire détecte un certificat révoqué ignoré par votre navigateur"> +"Afficher un avertissement si l'observatoire détecte un certificat révoqué mais ignoré par votre navigateur"> <!ENTITY ssl-observatory.prefs.show_cert_warning_tooltip -"Ceci comparera les certificats transmis aux listes de révocation des certificats. Malheureusement nous ne pouvons pas garantir que nous signalerons tous les certificats révoqués, mais si vous voyez un avertissement, il y a de bonnes chances que quelque ne va pas."> +"Ceci comparera les certificats transmis aux listes de révocation des certificats. Malheureusement, nous ne pouvons pas garantir que nous signalerons tous les certificats révoqués, mais si vous voyez un avertissement, il y a de bonnes chances que quelque chose ne va pas."> <!ENTITY ssl-observatory.prefs.done "Fait"> @@ -65,10 +65,7 @@ Mouseover the options for further details:">--> <!ENTITY ssl-observatory.prefs.explanation2 -"Par exemple, si vous visitez https://www.quelquechose.com, le certificat reçu -par l'observatoire indiquera que quelqu'un a visité www.quelquechose.com, -mais pas qui a visité le site, ou quelle page spécifique a été regardée. Passez -votre souris sur les options pour plus d'informations:"> +"Par exemple, si vous visitez https://www.quelquechose.com, le certificat reçu par l'observatoire indiquera que quelqu'un a visité www.quelquechose.com, mais pas l'identité de la personne qui a visité le site ni quelle page particulière a été regardée. Passez votre souris sur les options pour plus d'informations :"> <!ENTITY ssl-observatory.prefs.hide "Cacher les options avancées"> @@ -79,7 +76,7 @@ votre souris sur les options pour plus d'informations:"> "Nous essaierons encore de garder les données anonymes, mais cette option est moins sécuritaire"> <!ENTITY ssl-observatory.prefs.priv_dns -"Envoyer et vérifier les certificats des les noms de DNS non-publics "> +"Envoyer et vérifier les certificats des noms de DNS non-publics "> <!ENTITY ssl-observatory.prefs.priv_dns_tooltip "Au moins que cette option est activée, l'observatoire n'enregistrera pas les certificats pour les noms qu'il ne peut pas résoudre par le système DNS.">

1 0

[tor/master] Add an extra check to test_dir to try to debug windows jenkins issue
by nickm＠torproject.org 01 Jul '16

01 Jul '16

commit 738a8c655a1f8067b330b132164fa8879ef102c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 10:10:55 2016 -0400 Add an extra check to test_dir to try to debug windows jenkins issue --- src/test/test_dir.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/test/test_dir.c b/src/test/test_dir.c index a97ac7c..90b1864 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -4803,6 +4803,7 @@ test_dir_dump_unparseable_descriptors(void *data) /* Variables for reset_read_file_to_str_mock() */ +static int enforce_expected_filename = 0; static char *expected_filename = NULL; static char *file_content = NULL; static size_t file_content_len = 0; @@ -4834,6 +4835,11 @@ read_file_to_str_mock(const char *filename, int flags, /* Bump the call count */ ++read_call_count; + if (enforce_expected_filename) { + tt_assert(expected_filename); + tt_str_op(filename, OP_EQ, expected_filename); + } + if (expected_filename != NULL && file_content != NULL && strcmp(filename, expected_filename) == 0) { @@ -4948,11 +4954,13 @@ test_dir_populate_dump_desc_fifo(void *data) fname = "unparseable-desc." "DF0981323F3A70D02B55AB54B44B04F287D72F7B72F242E85C8CB0EDA8854A99"; + enforce_expected_filename = 1; tor_asprintf(&expected_filename, "%s%s%s", dirname, PATH_SEPARATOR, fname); file_content = tor_strdup("hanc culpam maiorem an illam dicam?"); file_content_len = strlen(file_content); file_stat.st_mtime = 123456; ent = dump_desc_populate_one_file(dirname, fname); + enforce_expected_filename = 0; tt_assert(ent == NULL); tt_int_op(unlinked_count, ==, 8); tt_int_op(read_count, ==, 1);

1 0

[tor/master] Fix a missing break; in dump_desc_init()
by nickm＠torproject.org 01 Jul '16

01 Jul '16

commit ac9784f7f5cc0f0723b0279ca75a6a373da1d4ed Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 10:02:22 2016 -0400 Fix a missing break; in dump_desc_init() Found by coverity scan; this is CID 1362983 --- src/or/routerparse.c | 1 + 1 file changed, 1 insertion(+) diff --git a/src/or/routerparse.c b/src/or/routerparse.c index 106110e..d257910 100644 --- a/src/or/routerparse.c +++ b/src/or/routerparse.c @@ -639,6 +639,7 @@ dump_desc_init(void) " exists: %s", dump_desc_dir, strerror(errno)); problem_with_dump_desc_dir = 1; + break; case FN_FILE: case FN_EMPTY: default:

1 0

[tor/master] Refactor authority_certs_fetch_missing to call get_options once
by nickm＠torproject.org 01 Jul '16

01 Jul '16

commit 596ccbf8396b10fb404594c201bd04ef135b330f Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Jul 1 09:35:27 2016 +1000 Refactor authority_certs_fetch_missing to call get_options once --- src/or/routerlist.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index d8319af..296dbd8 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -865,12 +865,13 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, smartlist_t *missing_cert_digests, *missing_id_digests; char *resource = NULL; cert_list_t *cl; - const int cache = directory_caches_unknown_auth_certs(get_options()); + const or_options_t *options = get_options(); + const int cache = directory_caches_unknown_auth_certs(options); fp_pair_t *fp_tmp = NULL; char id_digest_str[2*DIGEST_LEN+1]; char sk_digest_str[2*DIGEST_LEN+1]; - if (should_delay_dir_fetches(get_options(), NULL)) + if (should_delay_dir_fetches(options, NULL)) return; pending_cert = fp_pair_map_new(); @@ -911,7 +912,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, } SMARTLIST_FOREACH_END(cert); if (!found && download_status_is_ready(&(cl->dl_status_by_id), now, - get_options()->TestingCertMaxDownloadTries) && + options->TestingCertMaxDownloadTries) && !digestmap_get(pending_id, ds->v3_identity_digest)) { log_info(LD_DIR, "No current certificate known for authority %s " @@ -973,7 +974,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, } if (download_status_is_ready_by_sk_in_cl( cl, sig->signing_key_digest, - now, get_options()->TestingCertMaxDownloadTries) && + now, options->TestingCertMaxDownloadTries) && !fp_pair_map_get_by_digests(pending_cert, voter->identity_digest, sig->signing_key_digest)) { @@ -1075,7 +1076,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, * directory */ if (rs) { /* Certificate fetches are one-hop, unless AllDirActionsPrivate is 1 */ - int get_via_tor = get_options()->AllDirActionsPrivate; + int get_via_tor = options->AllDirActionsPrivate; const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS : DIRIND_ONEHOP; directory_initiate_command_routerstatus(rs, @@ -1136,7 +1137,7 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, * directory */ if (rs) { /* Certificate fetches are one-hop, unless AllDirActionsPrivate is 1 */ - int get_via_tor = get_options()->AllDirActionsPrivate; + int get_via_tor = options->AllDirActionsPrivate; const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS : DIRIND_ONEHOP; directory_initiate_command_routerstatus(rs,

1 0

[tor/master] Make authority_certs_fetch_missing support bridge hints
by nickm＠torproject.org 01 Jul '16

01 Jul '16

commit 516c02b178cf1fd5745280f9979ac67314857ecb Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Jul 1 14:01:25 2016 +1000 Make authority_certs_fetch_missing support bridge hints This also fixes an issue where bridge clients may have found a routerstatus for a directory mirror, and connected to it directly. --- src/or/routerlist.c | 93 +++++++++++++++++++++++++++++++++++++++-------------- 1 file changed, 69 insertions(+), 24 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index c08d1a3..d2068a2 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -835,30 +835,65 @@ authority_cert_dl_looks_uncertain(const char *id_digest) } /* Fetch the authority certificates specified in resource. - * If rs is not NULL, fetch from rs, otherwise, fetch from a random directory - * mirror. */ + * If we are a bridge client, and node is a configured bridge, fetch from node + * using dir_hint as the fingerprint. Otherwise, if rs is not NULL, fetch from + * rs. Otherwise, fetch from a random directory mirror. */ static void authority_certs_fetch_resource_impl(const char *resource, + const char *dir_hint, + const node_t *node, const routerstatus_t *rs) { + const or_options_t *options = get_options(); + int get_via_tor = purpose_needs_anonymity(DIR_PURPOSE_FETCH_CERTIFICATE, 0); + + /* Make sure bridge clients never connect to anything but a bridge */ + if (options->UseBridges) { + if (node && !node_is_a_configured_bridge(node)) { + /* If we're using bridges, and node is not a bridge, use a 3-hop path. */ + get_via_tor = 1; + } else if (!node) { + /* If we're using bridges, and there's no node, use a 3-hop path. */ + get_via_tor = 1; + } + } + + const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS + : DIRIND_ONEHOP; + + /* If we've just downloaded a consensus from a bridge, re-use that + * bridge */ + if (options->UseBridges && node && !get_via_tor) { + /* clients always make OR connections to bridges */ + tor_addr_port_t or_ap; + /* we are willing to use a non-preferred address if we need to */ + fascist_firewall_choose_address_node(node, FIREWALL_OR_CONNECTION, 0, + &or_ap); + directory_initiate_command(&or_ap.addr, or_ap.port, + NULL, 0, /*no dirport*/ + dir_hint, + DIR_PURPOSE_FETCH_CERTIFICATE, + 0, + indirection, + resource, NULL, 0, 0); + return; + } + if (rs) { /* If we've just downloaded a consensus from a directory, re-use that * directory */ - int get_via_tor = purpose_needs_anonymity( - DIR_PURPOSE_FETCH_CERTIFICATE, 0); - const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS - : DIRIND_ONEHOP; directory_initiate_command_routerstatus(rs, DIR_PURPOSE_FETCH_CERTIFICATE, 0, indirection, resource, NULL, 0, 0); - } else { - /* Otherwise, we want certs from a random fallback or directory - * mirror, because they will almost always succeed. */ - directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, - resource, PDS_RETRY_IF_NO_SERVERS, - DL_WANT_ANY_DIRSERVER); + return; } + + /* Otherwise, we want certs from a random fallback or directory + * mirror, because they will almost always succeed. */ + directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, + resource, PDS_RETRY_IF_NO_SERVERS, + DL_WANT_ANY_DIRSERVER); } /** Try to download any v3 authority certificates that we may be missing. If @@ -1038,7 +1073,10 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, } SMARTLIST_FOREACH_END(voter); } - /* Look up the routerstatus for the dir_hint */ + /* Bridge clients look up the node for the dir_hint */ + const node_t *node = NULL; + /* All clients, including bridge clients, look up the routerstatus for the + * dir_hint */ const routerstatus_t *rs = NULL; /* If we still need certificates, try the directory that just successfully @@ -1046,12 +1084,16 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, * As soon as the directory fails to provide additional certificates, we try * another, randomly selected directory. This avoids continual retries. * (We only ever have one outstanding request per certificate.) - * - * Bridge clients won't find their bridges using this hint, so they will - * fall back to using directory_get_from_dirserver, which selects a bridge. */ if (dir_hint) { - /* First try the consensus routerstatus, then the fallback + if (options->UseBridges) { + /* Bridge clients try the nodelist. If the dir_hint is from an authority, + * or something else fetched over tor, we won't find the node here, but + * we will find the rs. */ + node = node_get_by_id(dir_hint); + } + + /* All clients try the consensus routerstatus, then the fallback * routerstatus */ rs = router_get_consensus_status_by_id(dir_hint); if (!rs) { @@ -1063,9 +1105,10 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, } } - if (!rs) { - log_warn(LD_BUG, "Directory %s delivered a consensus, but a " - "routerstatus could not be found for it.", + if (!node && !rs) { + log_warn(LD_BUG, "Directory %s delivered a consensus, but %s" + "no routerstatus could be found for it.", + options->UseBridges ? "no node and " : "", hex_str(dir_hint, DIGEST_LEN)); } } @@ -1099,8 +1142,9 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, if (smartlist_len(fps) > 1) { resource = smartlist_join_strings(fps, "", 0, NULL); - /* rs is the directory that just gave us a consensus or certificates */ - authority_certs_fetch_resource_impl(resource, rs); + /* node and rs are directories that just gave us a consensus or + * certificates */ + authority_certs_fetch_resource_impl(resource, dir_hint, node, rs); tor_free(resource); } /* else we didn't add any: they were all pending */ @@ -1143,8 +1187,9 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, if (smartlist_len(fp_pairs) > 1) { resource = smartlist_join_strings(fp_pairs, "", 0, NULL); - /* rs is the directory that just gave us a consensus or certificates */ - authority_certs_fetch_resource_impl(resource, rs); + /* node and rs are directories that just gave us a consensus or + * certificates */ + authority_certs_fetch_resource_impl(resource, dir_hint, node, rs); tor_free(resource); } /* else they were all pending */

1 0

[tor/master] Refactor duplicate code in authority_certs_fetch_missing
by nickm＠torproject.org 01 Jul '16

01 Jul '16

commit f90bfaae8dabb6acf7656b20f1bc0513a683a0dd Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Jul 1 10:18:28 2016 +1000 Refactor duplicate code in authority_certs_fetch_missing --- src/or/routerlist.c | 69 ++++++++++++++++++++++++----------------------------- 1 file changed, 31 insertions(+), 38 deletions(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index cae0241..c08d1a3 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -834,6 +834,33 @@ authority_cert_dl_looks_uncertain(const char *id_digest) return n_failures >= N_AUTH_CERT_DL_FAILURES_TO_BUG_USER; } +/* Fetch the authority certificates specified in resource. + * If rs is not NULL, fetch from rs, otherwise, fetch from a random directory + * mirror. */ +static void +authority_certs_fetch_resource_impl(const char *resource, + const routerstatus_t *rs) +{ + if (rs) { + /* If we've just downloaded a consensus from a directory, re-use that + * directory */ + int get_via_tor = purpose_needs_anonymity( + DIR_PURPOSE_FETCH_CERTIFICATE, 0); + const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS + : DIRIND_ONEHOP; + directory_initiate_command_routerstatus(rs, + DIR_PURPOSE_FETCH_CERTIFICATE, + 0, indirection, resource, NULL, + 0, 0); + } else { + /* Otherwise, we want certs from a random fallback or directory + * mirror, because they will almost always succeed. */ + directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, + resource, PDS_RETRY_IF_NO_SERVERS, + DL_WANT_ANY_DIRSERVER); + } +} + /** Try to download any v3 authority certificates that we may be missing. If * <b>status</b> is provided, try to get all the ones that were used to sign * <b>status</b>. Additionally, try to have a non-expired certificate for @@ -1072,25 +1099,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, if (smartlist_len(fps) > 1) { resource = smartlist_join_strings(fps, "", 0, NULL); - - /* If we've just downloaded a consensus from a directory, re-use that - * directory */ - if (rs) { - int get_via_tor = purpose_needs_anonymity( - DIR_PURPOSE_FETCH_CERTIFICATE, 0); - const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS - : DIRIND_ONEHOP; - directory_initiate_command_routerstatus(rs, - DIR_PURPOSE_FETCH_CERTIFICATE, - 0, indirection, resource, NULL, - 0, 0); - } else { - /* Otherwise, we want certs from a random fallback or directory - * mirror, because they will almost always succeed. */ - directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, - resource, PDS_RETRY_IF_NO_SERVERS, - DL_WANT_ANY_DIRSERVER); - } + /* rs is the directory that just gave us a consensus or certificates */ + authority_certs_fetch_resource_impl(resource, rs); tor_free(resource); } /* else we didn't add any: they were all pending */ @@ -1133,25 +1143,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, if (smartlist_len(fp_pairs) > 1) { resource = smartlist_join_strings(fp_pairs, "", 0, NULL); - - /* If we've just downloaded a consensus from a directory, re-use that - * directory */ - if (rs) { - int get_via_tor = purpose_needs_anonymity( - DIR_PURPOSE_FETCH_CERTIFICATE, 0); - const dir_indirection_t indirection = get_via_tor ? DIRIND_ANONYMOUS - : DIRIND_ONEHOP; - directory_initiate_command_routerstatus(rs, - DIR_PURPOSE_FETCH_CERTIFICATE, - 0, indirection, resource, NULL, - 0, 0); - } else { - /* Otherwise, we want certs from a random fallback or directory - * mirror, because they will almost always succeed. */ - directory_get_from_dirserver(DIR_PURPOSE_FETCH_CERTIFICATE, 0, - resource, PDS_RETRY_IF_NO_SERVERS, - DL_WANT_ANY_DIRSERVER); - } + /* rs is the directory that just gave us a consensus or certificates */ + authority_certs_fetch_resource_impl(resource, rs); tor_free(resource); } /* else they were all pending */

1 0

[tor/master] Hex-encode raw digest before printing in authority_certs_fetch_missing
by nickm＠torproject.org 01 Jul '16

01 Jul '16

commit b4dcf56768e4b8c27fdade8f5f936dd7c651aeb0 Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Jul 1 09:38:41 2016 +1000 Hex-encode raw digest before printing in authority_certs_fetch_missing --- src/or/routerlist.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/or/routerlist.c b/src/or/routerlist.c index 296dbd8..6ad276a 100644 --- a/src/or/routerlist.c +++ b/src/or/routerlist.c @@ -1038,7 +1038,8 @@ authority_certs_fetch_missing(networkstatus_t *status, time_t now, if (!rs) { log_warn(LD_BUG, "Directory %s delivered a consensus, but a " - "routerstatus could not be found for it.", dir_hint); + "routerstatus could not be found for it.", + hex_str(dir_hint, DIGEST_LEN)); } }

1 0

[tor/master] Changes file for #19530
by nickm＠torproject.org 01 Jul '16

01 Jul '16

commit befd2e3d7fa28d143a2409b6b621041fd7e6285e Author: teor (Tim Wilson-Brown) <teor2345(a)gmail.com> Date: Fri Jul 1 14:06:24 2016 +1000 Changes file for #19530 --- changes/bug19530 | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/changes/bug19530 b/changes/bug19530 new file mode 100644 index 0000000..355d778 --- /dev/null +++ b/changes/bug19530 @@ -0,0 +1,6 @@ + o Minor bugfixes (directory downloads): + - Hex-encode a relay identity fingerprint before printing it. + - When downloading authority certificates, re-download from + the last successful bridge before retrying a random bridge. + Fixes bug 19530; bugfix on #18963, not in any released version + of tor.

1 0

[tor/master] Merge remote-tracking branch 'teor/bug19530-v2'
by nickm＠torproject.org 01 Jul '16

01 Jul '16

commit 0531d5155eddbbaca7c2a9d67e3954ee2599deb7 Merge: 903ec20 befd2e3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Jul 1 10:00:37 2016 -0400 Merge remote-tracking branch 'teor/bug19530-v2' changes/bug19530 | 6 +++ src/or/directory.c | 2 +- src/or/directory.h | 4 +- src/or/routerlist.c | 140 +++++++++++++++++++++++++++++++++------------------- 4 files changed, 99 insertions(+), 53 deletions(-)

1 0