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

[tor/master] Add a new consensus method that removes IPv6 address lines from microdescs
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit 67eeee0c713caccf8e2b4114e7ea22c083ec0cb3 Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 12:31:39 2017 -0400 Add a new consensus method that removes IPv6 address lines from microdescs Implements #23828. --- src/or/dirvote.c | 7 ++++++- src/or/dirvote.h | 6 +++++- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index 12aa2363c..0cbf8c48b 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -3831,7 +3831,10 @@ dirvote_create_microdescriptor(const routerinfo_t *ri, int consensus_method) smartlist_add_asprintf(chunks, "ntor-onion-key %s", kbuf); } + /* We originally put a lines in the micrdescriptors, but then we worked out + * that we needed them in the microdesc consensus. See #20916. */ if (consensus_method >= MIN_METHOD_FOR_A_LINES && + consensus_method < MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC && !tor_addr_is_null(&ri->ipv6_addr) && ri->ipv6_orport) smartlist_add_asprintf(chunks, "a %s\n", fmt_addrport(&ri->ipv6_addr, ri->ipv6_orport)); @@ -3940,7 +3943,9 @@ static const struct consensus_method_range_t { {MIN_METHOD_FOR_P6_LINES, MIN_METHOD_FOR_NTOR_KEY - 1}, {MIN_METHOD_FOR_NTOR_KEY, MIN_METHOD_FOR_ID_HASH_IN_MD - 1}, {MIN_METHOD_FOR_ID_HASH_IN_MD, MIN_METHOD_FOR_ED25519_ID_IN_MD - 1}, - {MIN_METHOD_FOR_ED25519_ID_IN_MD, MAX_SUPPORTED_CONSENSUS_METHOD}, + {MIN_METHOD_FOR_ED25519_ID_IN_MD, + MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC - 1}, + {MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC, MAX_SUPPORTED_CONSENSUS_METHOD}, {-1, -1} }; diff --git a/src/or/dirvote.h b/src/or/dirvote.h index b3838eee9..5a4cef7b9 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -59,7 +59,7 @@ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 27 +#define MAX_SUPPORTED_CONSENSUS_METHOD 28 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@ -123,6 +123,10 @@ * addresses. See #23826 and #20916. */ #define MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS 27 +/** Lowest consensus method where microdescriptors do not contain relay IPv6 + * addresses. See #23828 and #20916. */ +#define MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC 28 + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */

1 0

[tor/master] Changes file for #23826, #23828, and #23870
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit a2c09f67512e79ed2c714e698c0234b7c8fad8a9 Author: teor <teor2345(a)gmail.com> Date: Wed Oct 25 13:24:51 2017 +1100 Changes file for #23826, #23828, and #23870 --- changes/bug23826-23828 | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/changes/bug23826-23828 b/changes/bug23826-23828 new file mode 100644 index 000000000..2b991e5c1 --- /dev/null +++ b/changes/bug23826-23828 @@ -0,0 +1,14 @@ + o Major features (IPv6, directory documents): + - Add consensus method 27, which adds IPv6 ORPorts to the microdesc + consensus. This makes it easier for IPv6 clients to bootstrap and + choose reachable entry guards. + Implements 23826. + - Add consensus method 28, which removes IPv6 ORPorts from + microdescriptors. Now that there are IPv6 ORPorts in the microdesc + consensus, they are redundant in microdescs. This change is compatible + with tor clients on 0.2.8.x and later. (0.2.8.x introduced client IPv6 + bootstrap and guard support.) + Implements 23828. + - Expand the documentation for AuthDirHasIPv6Connectivity when it is set + by different numbers of authorities. + Fixes 23870 on 0.2.4.1-alpha.

1 0

[tor/master] Add a consensus method for IPv6 address lines in the microdesc consensus
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit 56dbba32079484d88016bd34de04122457dbdd89 Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 12:10:51 2017 -0400 Add a consensus method for IPv6 address lines in the microdesc consensus Implements #23826. --- src/or/dirserv.c | 8 +++++--- src/or/dirvote.h | 6 +++++- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index 42ffdfa0d..ad6448a3d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1949,8 +1949,10 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, * networkstatus_type_t values, with an additional control port value * added -MP */ - /* V3 microdesc consensuses don't have "a" lines. */ - if (format == NS_V3_CONSENSUS_MICRODESC) + /* V3 microdesc consensuses only have "a" lines in later consensus methods + */ + if (format == NS_V3_CONSENSUS_MICRODESC && + consensus_method < MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS) goto done; /* Possible "a" line. At most one for now. */ @@ -1959,7 +1961,7 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, fmt_addrport(&rs->ipv6_addr, rs->ipv6_orport)); } - if (format == NS_V3_CONSENSUS) + if (format == NS_V3_CONSENSUS || format == NS_V3_CONSENSUS_MICRODESC) goto done; smartlist_add_asprintf(chunks, diff --git a/src/or/dirvote.h b/src/or/dirvote.h index ddf32277d..b3838eee9 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -59,7 +59,7 @@ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 /** The highest consensus method that we currently support. */ -#define MAX_SUPPORTED_CONSENSUS_METHOD 26 +#define MAX_SUPPORTED_CONSENSUS_METHOD 27 /** Lowest consensus method where microdesc consensuses omit any entry * with no microdesc. */ @@ -119,6 +119,10 @@ * instead of 0. See #14881 */ #define MIN_METHOD_FOR_INIT_BW_WEIGHTS_ONE 26 +/** Lowest consensus method where the microdesc consensus contains relay IPv6 + * addresses. See #23826 and #20916. */ +#define MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS 27 + /** Default bandwidth to clip unmeasured bandwidths to using method >= * MIN_METHOD_TO_CLIP_UNMEASURED_BW. (This is not a consensus method; do not * get confused with the above macros.) */

1 0

[tor/master] Improve the comment on networkstatus_compute_consensus()
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit 305f9476713b8c2d098dc6ba8098a4a9f39a86ad Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 12:08:55 2017 -0400 Improve the comment on networkstatus_compute_consensus() --- src/or/dirvote.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/or/dirvote.c b/src/or/dirvote.c index ba0ab7a77..ee6691cbb 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -1315,8 +1315,9 @@ compute_nth_protocol_set(int n, int n_voters, const smartlist_t *votes) /** Given a list of vote networkstatus_t in votes, our public * authority identity_key, our private authority signing_key, * and the number of total_authorities that we believe exist in our - * voting quorum, generate the text of a new v3 consensus vote, and return the - * value in a newly allocated string. + * voting quorum, generate the text of a new v3 consensus or microdescriptor + * consensus (depending on flavor), and return the value in a newly + * allocated string. * * Note: this function DOES NOT check whether the votes are from * recognized authorities. (dirvote_add_vote does that.)

1 0

[tor/master] Add a consensus_method argument to routerstatus_format_entry()
by nickm＠torproject.org 04 Dec '17

04 Dec '17

commit b8d4588c90d399b4b4487dfbacfdbe6dd415aac4 Author: teor <teor2345(a)gmail.com> Date: Sun Oct 15 12:09:52 2017 -0400 Add a consensus_method argument to routerstatus_format_entry() And pass ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD when it's not applicable. Preparation for #23826. --- src/or/dirserv.c | 11 +++++++++-- src/or/dirserv.h | 1 + src/or/dirvote.c | 7 +++++-- src/or/dirvote.h | 4 ++++ src/or/networkstatus.c | 4 +++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/src/or/dirserv.c b/src/or/dirserv.c index ddee92da5..42ffdfa0d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -1897,21 +1897,28 @@ version_from_platform(const char *platform) /** Helper: write the router-status information in rs into a newly * allocated character buffer. Use the same format as in network-status * documents. If version is non-NULL, add a "v" line for the platform. + * + * consensus_method is the current consensus method when format is + * NS_V3_CONSENSUS or NS_V3_CONSENSUS_MICRODESC. It is ignored for other + * formats: pass ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD. + * * Return 0 on success, -1 on failure. * * The format argument has one of the following values: * NS_V2 - Output an entry suitable for a V2 NS opinion document * NS_V3_CONSENSUS - Output the first portion of a V3 NS consensus entry + * for consensus_method. * NS_V3_CONSENSUS_MICRODESC - Output the first portion of a V3 microdesc - * consensus entry. + * consensus entry for consensus_method. * NS_V3_VOTE - Output a complete V3 NS vote. If vrs is present, * it contains additional information for the vote. - * NS_CONTROL_PORT - Output a NS document for the control port + * NS_CONTROL_PORT - Output a NS document for the control port. */ char * routerstatus_format_entry(const routerstatus_t *rs, const char *version, const char *protocols, routerstatus_format_type_t format, + int consensus_method, const vote_routerstatus_t *vrs) { char *summary; diff --git a/src/or/dirserv.h b/src/or/dirserv.h index 46967a6cb..9dc239f21 100644 --- a/src/or/dirserv.h +++ b/src/or/dirserv.h @@ -150,6 +150,7 @@ char *routerstatus_format_entry( const char *version, const char *protocols, routerstatus_format_type_t format, + int consensus_method, const vote_routerstatus_t *vrs); void dirserv_free_all(void); void cached_dir_decref(cached_dir_t *d); diff --git a/src/or/dirvote.c b/src/or/dirvote.c index ee6691cbb..12aa2363c 100644 --- a/src/or/dirvote.c +++ b/src/or/dirvote.c @@ -278,7 +278,9 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, vote_microdesc_hash_t *h; rsf = routerstatus_format_entry(&vrs->status, vrs->version, vrs->protocols, - NS_V3_VOTE, vrs); + NS_V3_VOTE, + ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD, + vrs); if (rsf) smartlist_add(chunks, rsf); @@ -2100,7 +2102,8 @@ networkstatus_compute_consensus(smartlist_t *votes, char *buf; /* Okay!! Now we can write the descriptor... */ /* First line goes into "buf". */ - buf = routerstatus_format_entry(&rs_out, NULL, NULL, rs_format, NULL); + buf = routerstatus_format_entry(&rs_out, NULL, NULL, + rs_format, consensus_method, NULL); if (buf) smartlist_add(chunks, buf); } diff --git a/src/or/dirvote.h b/src/or/dirvote.h index fb3e60f00..ddf32277d 100644 --- a/src/or/dirvote.h +++ b/src/or/dirvote.h @@ -51,6 +51,10 @@ #define MIN_VOTE_INTERVAL_TESTING_INITIAL \ ((MIN_VOTE_SECONDS_TESTING)+(MIN_DIST_SECONDS_TESTING)+1) +/* A placeholder for routerstatus_format_entry() when the consensus method + * argument is not applicable. */ +#define ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD 0 + /** The lowest consensus method that we currently support. */ #define MIN_SUPPORTED_CONSENSUS_METHOD 13 diff --git a/src/or/networkstatus.c b/src/or/networkstatus.c index 93bb8643d..d31953d76 100644 --- a/src/or/networkstatus.c +++ b/src/or/networkstatus.c @@ -2193,7 +2193,9 @@ signed_descs_update_status_from_consensus_networkstatus(smartlist_t *descs) char * networkstatus_getinfo_helper_single(const routerstatus_t *rs) { - return routerstatus_format_entry(rs, NULL, NULL, NS_CONTROL_PORT, NULL); + return routerstatus_format_entry(rs, NULL, NULL, NS_CONTROL_PORT, + ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD, + NULL); } /** Alloc and return a string describing routerstatuses for the most

1 0

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

04 Dec '17

commit d363d4fa42e7c563523bf09c0130f2ed84b7f4ba Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 4 12:20:42 2017 +0000 Update translations for tails-greeter-2 --- az/az.po | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/az/az.po b/az/az.po index 024a78ff6..6845ac057 100644 --- a/az/az.po +++ b/az/az.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-MO-DA HO:MI+ZONE\n" -"Last-Translator: fiore <salimova.gulnar(a)gmail.com>, 2017\n" +"Last-Translator: Nikafn <appone6(a)gmail.com>, 2017\n" "Language-Team: Azerbaijani (https://www.transifex.com/otf/teams/1519/az/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -251,7 +251,7 @@ msgstr "" #: ../tailsgreeter/gui.py:602 msgid "Cancel" -msgstr "" +msgstr "Ləğv et" #: ../tailsgreeter/gui.py:608 msgid "Add"

1 0

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

04 Dec '17

commit 00c0734fcb0a77c300a708cf21712b95e3948072 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 4 12:20:31 2017 +0000 Update translations for tor-messenger-uiproperties --- az/ui.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az/ui.properties b/az/ui.properties index e5843623f..1cc12295f 100644 --- a/az/ui.properties +++ b/az/ui.properties @@ -2,7 +2,7 @@ start.label=Start private conversation end.label=End private conversation refresh.label=Refresh private conversation auth.label=Verify your contact's identity -auth.cancel=Cancel +auth.cancel=Ləğv et auth.cancelAccessKey=C auth.error=An error occurred while verifying your contact's identity. auth.success=Verifying your contact's identity completed successfully.

1 0

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

04 Dec '17

commit 48c3d25489437c553894ae138fd61b3aef87b5b7 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 4 12:19:45 2017 +0000 Update translations for tor-messenger-fingerdtd --- az/finger.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az/finger.dtd b/az/finger.dtd index 6efd9312b..ffbd49376 100644 --- a/az/finger.dtd +++ b/az/finger.dtd @@ -10,6 +10,6 @@ <!ENTITY finger.intro "Manage the list of fingerprints you've seen."> <!ENTITY addFingerDialog.title "Add Fingerprint"> <!ENTITY addFingerDialog.finger "Barmaq izi"> -<!ENTITY addFingerDialog.accept "OK"> +<!ENTITY addFingerDialog.accept "Oldu"> <!ENTITY addFingerDialog.cancel "Skip"> <!ENTITY addFingerDialog.tooltip "If you know the 40 hex char fingerprint of your contact's OTR private key, enter it now."> \ No newline at end of file

1 0

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

04 Dec '17

commit 74454d8419e7583283fa03d01ddfc4955f2989f5 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 4 12:17:12 2017 +0000 Update translations for tails-misc --- az.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/az.po b/az.po index c7c4244d2..bc5df95c4 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: 2017-09-13 20:10+0200\n" -"PO-Revision-Date: 2017-09-26 14:31+0000\n" +"PO-Revision-Date: 2017-12-04 12:14+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

[metrics-web/master] Update to latest metrics-lib.
by karsten＠torproject.org 04 Dec '17

04 Dec '17

commit d4fc1beeffd1bed38778ae592838aad5a8652c76 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Mon Dec 4 12:14:11 2017 +0100 Update to latest metrics-lib. --- submods/metrics-lib | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/submods/metrics-lib b/submods/metrics-lib index 663bdc2..79a4b98 160000 --- a/submods/metrics-lib +++ b/submods/metrics-lib @@ -1 +1 @@ -Subproject commit 663bdc285c4b5e0979691c44bf4790779df9bdf0 +Subproject commit 79a4b9866f2a342159bd0811d83e9ec62169c6d9

1 0