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

[torspec/master] Merge remote-tracking branch 'tor-github/pr/101'
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 3882ddb3cf440ef1bfcd024f209c51394a5dc7ab Merge: e99deb8 43cfa4f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 16 16:46:08 2020 -0500 Merge remote-tracking branch 'tor-github/pr/101' dir-spec.txt | 6 ++++++ 1 file changed, 6 insertions(+)

1 0

[torspec/master] dir-spec: Add a summary for consensus method 29
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 46cba9d8dae70d8ea5ce1114131276257ac45d71 Author: teor <teor(a)torproject.org> Date: Wed Jan 15 21:15:46 2020 +1000 dir-spec: Add a summary for consensus method 29 When we documented prop298 in dir-spec, we forgot the consensus method summary. Part of 28266. --- dir-spec.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index 034149e..b01294b 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2964,6 +2964,9 @@ * If consensus method 28 or later is used, microdescriptors no longer include "a" lines. + * If consensus method 29 or later is used, microdescriptor "family" + lines are canonicalized to improve compression. + The signatures at the end of a consensus document are sorted in ascending order by identity digest.

1 0

[torspec/master] dir-spec: Consensus methods 25-27 are no longer advertised
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 43cfa4f38f436cfee2f24082e13cbd43c36d1d88 Author: teor <teor(a)torproject.org> Date: Wed Jan 15 21:16:30 2020 +1000 dir-spec: Consensus methods 25-27 are no longer advertised Part of 32695, closes 32955. --- dir-spec.txt | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dir-spec.txt b/dir-spec.txt index b01294b..1a7a1cd 100644 --- a/dir-spec.txt +++ b/dir-spec.txt @@ -2961,6 +2961,9 @@ * If consensus method 27 or later is used, the microdesc consensus may include an "a" line for each router, listing an IPv6 OR port. + [ As of 0.4.3.1-alpha, authorities no longer advertise or negotiate + any consensus methods lower than 28. ] + * If consensus method 28 or later is used, microdescriptors no longer include "a" lines.

1 0

[tor/master] Remove functions that checked for pre-ipv6 consensus.
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit ceacda44f1064a5cc06a7eb29f31de19844ca6a7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 15 11:26:14 2020 -0500 Remove functions that checked for pre-ipv6 consensus. We no longer need or need to test: * node_awaiting_ipv6() * networkstatus_consensus_has_ipv6(). --- src/core/or/policies.c | 56 +---------------------- src/feature/nodelist/networkstatus.c | 22 --------- src/feature/nodelist/networkstatus.h | 1 - src/test/test_dir.c | 88 ------------------------------------ 4 files changed, 1 insertion(+), 166 deletions(-) diff --git a/src/core/or/policies.c b/src/core/or/policies.c index 0f7cc5057..a82995fe1 100644 --- a/src/core/or/policies.c +++ b/src/core/or/policies.c @@ -933,49 +933,6 @@ fascist_firewall_choose_address_ipv4h(uint32_t ipv4h_addr, pref_ipv6, ap); } -/* Some microdescriptor consensus methods have no IPv6 addresses in rs: they - * are in the microdescriptors. For these consensus methods, we can't rely on - * the node's IPv6 address until its microdescriptor is available (when using - * microdescs). - * But for bridges, rewrite_node_address_for_bridge() updates node->ri with - * the configured address, so we can trust bridge addresses. - * (Bridges could gain an IPv6 address if their microdescriptor arrives, but - * this will never be their preferred address: that is in the config.) - * Returns true if the node needs a microdescriptor for its IPv6 address, and - * false if the addresses in the node are already up-to-date. - */ -static int -node_awaiting_ipv6(const or_options_t* options, const node_t *node) -{ - tor_assert(node); - - /* There's no point waiting for an IPv6 address if we'd never use it */ - if (!fascist_firewall_use_ipv6(options)) { - return 0; - } - - /* If the node has an IPv6 address, we're not waiting */ - if (node_has_ipv6_addr(node)) { - return 0; - } - - /* If the current consensus method and flavour has IPv6 addresses, we're not - * waiting */ - if (networkstatus_consensus_has_ipv6(options)) { - return 0; - } - - /* Bridge clients never use the address from a bridge's md, so there's no - * need to wait for it. */ - if (node_is_a_configured_bridge(node)) { - return 0; - } - - /* We are waiting if we_use_microdescriptors_for_circuits() and we have no - * md. */ - return (!node->md && we_use_microdescriptors_for_circuits(options)); -} - /** Like fascist_firewall_choose_address_base(), but takes <b>rs</b>. * Consults the corresponding node, then falls back to rs if node is NULL. * This should only happen when there's no valid consensus, and rs doesn't @@ -998,7 +955,7 @@ fascist_firewall_choose_address_rs(const routerstatus_t *rs, const or_options_t *options = get_options(); const node_t *node = node_get_by_id(rs->identity_digest); - if (node && !node_awaiting_ipv6(options, node)) { + if (node) { fascist_firewall_choose_address_node(node, fw_connection, pref_only, ap); } else { /* There's no node-specific IPv6 preference, so use the generic IPv6 @@ -1111,17 +1068,6 @@ fascist_firewall_choose_address_node(const node_t *node, } node_assert_ok(node); - /* Calling fascist_firewall_choose_address_node() when the node is missing - * IPv6 information breaks IPv6-only clients. - * If the node is a hard-coded fallback directory or authority, call - * fascist_firewall_choose_address_rs() on the fake (hard-coded) routerstatus - * for the node. - * If it is not hard-coded, check that the node has a microdescriptor, full - * descriptor (routerinfo), or is one of our configured bridges before - * calling this function. */ - if (BUG(node_awaiting_ipv6(get_options(), node))) { - return; - } const int pref_ipv6_node = (fw_connection == FIREWALL_OR_CONNECTION ? node_ipv6_or_preferred(node) diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index d0fada44d..868812aaa 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1577,28 +1577,6 @@ networkstatus_consensus_is_already_downloading(const char *resource) return answer; } -/* Does the current, reasonably live consensus have IPv6 addresses? - * Returns 1 if there is a reasonably live consensus and its consensus method - * includes IPv6 addresses in the consensus. - * Otherwise, if there is no consensus, or the method does not include IPv6 - * addresses, returns 0. */ -int -networkstatus_consensus_has_ipv6(const or_options_t* options) -{ - (void) options; - const networkstatus_t *cons = networkstatus_get_reasonably_live_consensus( - approx_time(), - usable_consensus_flavor()); - - /* If we have no consensus, we have no IPv6 in it */ - if (!cons) { - return 0; - } - - /* All supported consensus methods have IPv6 addresses. */ - return 1; -} - /** Given two router status entries for the same router identity, return 1 if * if the contents have changed between them. Otherwise, return 0. */ static int diff --git a/src/feature/nodelist/networkstatus.h b/src/feature/nodelist/networkstatus.h index b8430088c..38929fa6b 100644 --- a/src/feature/nodelist/networkstatus.h +++ b/src/feature/nodelist/networkstatus.h @@ -104,7 +104,6 @@ int networkstatus_consensus_can_use_multiple_directories( MOCK_DECL(int, networkstatus_consensus_can_use_extra_fallbacks,( const or_options_t *options)); int networkstatus_consensus_is_already_downloading(const char *resource); -int networkstatus_consensus_has_ipv6(const or_options_t* options); #define NSSET_FROM_CACHE 1 #define NSSET_WAS_WAITING_FOR_CERTS 2 diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 535c7bb69..f16b054c6 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7065,93 +7065,6 @@ test_dir_platform_str(void *arg) ; } -static networkstatus_t *mock_networkstatus; - -static networkstatus_t * -mock_networkstatus_get_latest_consensus_by_flavor(consensus_flavor_t f) -{ - (void)f; - return mock_networkstatus; -} - -static void -test_dir_networkstatus_consensus_has_ipv6(void *arg) -{ - (void)arg; - - int has_ipv6 = 0; - - /* Init options and networkstatus */ - or_options_t our_options; - mock_options = &our_options; - reset_options(mock_options, &mock_get_options_calls); - MOCK(get_options, mock_get_options); - - networkstatus_t our_networkstatus; - mock_networkstatus = &our_networkstatus; - memset(mock_networkstatus, 0, sizeof(*mock_networkstatus)); - MOCK(networkstatus_get_latest_consensus_by_flavor, - mock_networkstatus_get_latest_consensus_by_flavor); - - /* A live consensus */ - mock_networkstatus->valid_after = time(NULL) - 3600; - mock_networkstatus->valid_until = time(NULL) + 3600; - - /* Test the bounds for A lines in the NS consensus */ - mock_options->UseMicrodescriptors = 0; - - mock_networkstatus->consensus_method = MIN_SUPPORTED_CONSENSUS_METHOD; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(has_ipv6); - - /* Test the bounds for A lines in the microdesc consensus */ - mock_options->UseMicrodescriptors = 1; - - mock_networkstatus->consensus_method = - MIN_SUPPORTED_CONSENSUS_METHOD; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(has_ipv6); - - mock_networkstatus->consensus_method = MAX_SUPPORTED_CONSENSUS_METHOD + 20; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(has_ipv6); - - mock_networkstatus->consensus_method = - MIN_SUPPORTED_CONSENSUS_METHOD + 1; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(has_ipv6); - - mock_networkstatus->consensus_method = - MIN_SUPPORTED_CONSENSUS_METHOD + 20; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(has_ipv6); - - /* Test the edge cases */ - mock_options->UseMicrodescriptors = 1; - mock_networkstatus->consensus_method = - MIN_SUPPORTED_CONSENSUS_METHOD; - - /* Reasonably live */ - mock_networkstatus->valid_until = approx_time() - 60; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(has_ipv6); - - /* Not reasonably live */ - mock_networkstatus->valid_after = approx_time() - 24*60*60 - 3600; - mock_networkstatus->valid_until = approx_time() - 24*60*60 - 60; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(!has_ipv6); - - /* NULL consensus */ - mock_networkstatus = NULL; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(!has_ipv6); - - done: - UNMOCK(get_options); - UNMOCK(networkstatus_get_latest_consensus_by_flavor); -} - static void test_dir_format_versions_list(void *arg) { @@ -7290,7 +7203,6 @@ struct testcase_t dir_tests[] = { DIR(matching_flags, 0), DIR(networkstatus_compute_bw_weights_v10, 0), DIR(platform_str, 0), - DIR(networkstatus_consensus_has_ipv6, TT_FORK), DIR(format_versions_list, TT_FORK), END_OF_TESTCASES };

1 0

[tor/master] Merge branch 'ticket32695_squashed'
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 01fdc3240f59f2d9a682b3c2a2d58db01d0bd7a3 Merge: 17c63ff9f ceacda44f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 16 16:42:01 2020 -0500 Merge branch 'ticket32695_squashed' changes/ticket32695 | 6 +++ src/core/or/policies.c | 56 +------------------- src/feature/dirauth/dirvote.c | 21 ++------ src/feature/dirauth/dirvote.h | 26 +-------- src/feature/nodelist/fmt_routerstatus.c | 11 ---- src/feature/nodelist/fmt_routerstatus.h | 1 - src/feature/nodelist/networkstatus.c | 27 ---------- src/feature/nodelist/networkstatus.h | 1 - src/test/test_dir.c | 93 --------------------------------- 9 files changed, 12 insertions(+), 230 deletions(-) diff --cc src/test/test_dir.c index 6430b5871,f16b054c6..76c86c258 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@@ -7593,12 -7203,6 +7501,11 @@@ struct testcase_t dir_tests[] = DIR(matching_flags, 0), DIR(networkstatus_compute_bw_weights_v10, 0), DIR(platform_str, 0), - DIR(networkstatus_consensus_has_ipv6, TT_FORK), DIR(format_versions_list, TT_FORK), + DIR(add_fingerprint, TT_FORK), + DIR(dirserv_load_fingerprint_file, TT_FORK), + DIR(dirserv_router_get_status, TT_FORK), + DIR(dirserv_would_reject_router, TT_FORK), + DIR(dirserv_add_own_fingerprint, TT_FORK), END_OF_TESTCASES };

1 0

[tor/master] Remove support for now-obsolete consensus methods before 28.
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 441a048a3a135a9405f4fb8463fb60a0f11e42d2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 9 12:41:56 2020 -0500 Remove support for now-obsolete consensus methods before 28. Closes ticket 32695. --- changes/ticket32695 | 6 ++++++ src/feature/dirauth/dirvote.c | 18 +++--------------- src/feature/dirauth/dirvote.h | 22 +--------------------- src/feature/nodelist/fmt_routerstatus.c | 8 ++------ src/feature/nodelist/networkstatus.c | 10 +++------- src/test/test_dir.c | 13 ++++--------- 6 files changed, 19 insertions(+), 58 deletions(-) diff --git a/changes/ticket32695 b/changes/ticket32695 new file mode 100644 index 000000000..2df53144e --- /dev/null +++ b/changes/ticket32695 @@ -0,0 +1,6 @@ + o Removed features: + - We no longer support consensus methods before method 28; these + methods were only used by authorities running versions of Tor that + are now at end-of-life. In effect, this means that clients and + relays, and authorities now assume that authorities will be + running version 0.3.5.x or later. Closes ticket 32695. diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 9889170a2..c1d4ff1a7 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -1540,14 +1540,11 @@ networkstatus_compute_consensus(smartlist_t *votes, consensus_method = MAX_SUPPORTED_CONSENSUS_METHOD; } - if (consensus_method >= MIN_METHOD_FOR_INIT_BW_WEIGHTS_ONE) { + { /* It's smarter to initialize these weights to 1, so that later on, * we can't accidentally divide by zero. */ G = M = E = D = 1; T = 4; - } else { - /* ...but originally, they were set to zero. */ - G = M = E = D = T = 0; } /* Compute medians of time-related things, and figure out how many @@ -2268,8 +2265,7 @@ networkstatus_compute_consensus(smartlist_t *votes, smartlist_add_strdup(chunks, chosen_version); } smartlist_add_strdup(chunks, "\n"); - if (chosen_protocol_list && - consensus_method >= MIN_METHOD_FOR_RS_PROTOCOLS) { + if (chosen_protocol_list) { smartlist_add_asprintf(chunks, "pr %s\n", chosen_protocol_list); } /* Now the weight line. */ @@ -3805,13 +3801,6 @@ 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_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)); - if (family) { if (consensus_method < MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS) { smartlist_add_asprintf(chunks, "family %s\n", family); @@ -3917,8 +3906,7 @@ static const struct consensus_method_range_t { int low; int high; } microdesc_consensus_methods[] = { - {MIN_SUPPORTED_CONSENSUS_METHOD, MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC - 1}, - {MIN_METHOD_FOR_NO_A_LINES_IN_MICRODESC, + {MIN_SUPPORTED_CONSENSUS_METHOD, MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS - 1}, {MIN_METHOD_FOR_CANONICAL_FAMILIES_IN_MICRODESCS, MAX_SUPPORTED_CONSENSUS_METHOD}, diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index 063977d02..b614f303d 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -54,31 +54,11 @@ #define ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD 0 /** The lowest consensus method that we currently support. */ -#define MIN_SUPPORTED_CONSENSUS_METHOD 25 +#define MIN_SUPPORTED_CONSENSUS_METHOD 28 /** The highest consensus method that we currently support. */ #define MAX_SUPPORTED_CONSENSUS_METHOD 29 -/** Lowest consensus method where authorities vote on required/recommended - * protocols. */ -#define MIN_METHOD_FOR_RECOMMENDED_PROTOCOLS 25 - -/** Lowest consensus method where authorities add protocols to routerstatus - * entries. */ -#define MIN_METHOD_FOR_RS_PROTOCOLS 25 - -/** Lowest consensus method where authorities initialize bandwidth weights to 1 - * 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 - -/** 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 - /** * Lowest consensus method where microdescriptor lines are put in canonical * form for improved compressibility and ease of storage. See proposal 298. diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index 8dde0088d..e9b00939e 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -50,6 +50,8 @@ routerstatus_format_entry(const routerstatus_t *rs, const char *version, int consensus_method, const vote_routerstatus_t *vrs) { + (void) consensus_method; + char *summary; char *result = NULL; @@ -78,12 +80,6 @@ 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 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. */ if (!tor_addr_is_null(&rs->ipv6_addr)) { smartlist_add_asprintf(chunks, "a %s\n", diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index 786802047..f88b5e6d6 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -1585,6 +1585,7 @@ networkstatus_consensus_is_already_downloading(const char *resource) int networkstatus_consensus_has_ipv6(const or_options_t* options) { + (void) options; const networkstatus_t *cons = networkstatus_get_reasonably_live_consensus( approx_time(), usable_consensus_flavor()); @@ -1594,13 +1595,8 @@ networkstatus_consensus_has_ipv6(const or_options_t* options) return 0; } - /* Different flavours of consensus gained IPv6 at different times */ - if (we_use_microdescriptors_for_circuits(options)) { - return - cons->consensus_method >= MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS; - } else { - return 1; - } + /* All supported consensus methods have IPv6 addresses. */ + return 1; } /** Given two router status entries for the same router identity, return 1 if diff --git a/src/test/test_dir.c b/src/test/test_dir.c index 3a7ba4292..535c7bb69 100644 --- a/src/test/test_dir.c +++ b/src/test/test_dir.c @@ -7108,7 +7108,7 @@ test_dir_networkstatus_consensus_has_ipv6(void *arg) mock_options->UseMicrodescriptors = 1; mock_networkstatus->consensus_method = - MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS; + MIN_SUPPORTED_CONSENSUS_METHOD; has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); tt_assert(has_ipv6); @@ -7117,24 +7117,19 @@ test_dir_networkstatus_consensus_has_ipv6(void *arg) tt_assert(has_ipv6); mock_networkstatus->consensus_method = - MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS + 1; + MIN_SUPPORTED_CONSENSUS_METHOD + 1; has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); tt_assert(has_ipv6); mock_networkstatus->consensus_method = - MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS + 20; + MIN_SUPPORTED_CONSENSUS_METHOD + 20; has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); tt_assert(has_ipv6); - mock_networkstatus->consensus_method = - MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS - 1; - has_ipv6 = networkstatus_consensus_has_ipv6(get_options()); - tt_assert(!has_ipv6); - /* Test the edge cases */ mock_options->UseMicrodescriptors = 1; mock_networkstatus->consensus_method = - MIN_METHOD_FOR_A_LINES_IN_MICRODESC_CONSENSUS; + MIN_SUPPORTED_CONSENSUS_METHOD; /* Reasonably live */ mock_networkstatus->valid_until = approx_time() - 60;

1 0

[tor/master] Remove routerstatus_format_entry() consensus_method argument as unused
by nickm＠torproject.org 16 Jan '20

16 Jan '20

commit 8d94bcbf8c7c34a6e2d683982ef22ab6949c34ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jan 15 11:20:30 2020 -0500 Remove routerstatus_format_entry() consensus_method argument as unused --- src/feature/dirauth/dirvote.c | 3 +-- src/feature/dirauth/dirvote.h | 4 ---- src/feature/nodelist/fmt_routerstatus.c | 7 ------- src/feature/nodelist/fmt_routerstatus.h | 1 - src/feature/nodelist/networkstatus.c | 1 - 5 files changed, 1 insertion(+), 15 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index c1d4ff1a7..97fe66c1a 100644 --- a/src/feature/dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -384,7 +384,6 @@ format_networkstatus_vote(crypto_pk_t *private_signing_key, rsf = routerstatus_format_entry(&vrs->status, vrs->version, vrs->protocols, NS_V3_VOTE, - ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD, vrs); if (rsf) smartlist_add(chunks, rsf); @@ -2245,7 +2244,7 @@ networkstatus_compute_consensus(smartlist_t *votes, /* Okay!! Now we can write the descriptor... */ /* First line goes into "buf". */ buf = routerstatus_format_entry(&rs_out, NULL, NULL, - rs_format, consensus_method, NULL); + rs_format, NULL); if (buf) smartlist_add(chunks, buf); } diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index b614f303d..f695e93ab 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -49,10 +49,6 @@ #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 28 diff --git a/src/feature/nodelist/fmt_routerstatus.c b/src/feature/nodelist/fmt_routerstatus.c index e9b00939e..b3f1c6962 100644 --- a/src/feature/nodelist/fmt_routerstatus.c +++ b/src/feature/nodelist/fmt_routerstatus.c @@ -27,10 +27,6 @@ * allocated character buffer. Use the same format as in network-status * documents. If <b>version</b> 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: @@ -47,11 +43,8 @@ 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) { - (void) consensus_method; - char *summary; char *result = NULL; diff --git a/src/feature/nodelist/fmt_routerstatus.h b/src/feature/nodelist/fmt_routerstatus.h index 7a50027a3..a007989af 100644 --- a/src/feature/nodelist/fmt_routerstatus.h +++ b/src/feature/nodelist/fmt_routerstatus.h @@ -35,7 +35,6 @@ char *routerstatus_format_entry( const char *version, const char *protocols, routerstatus_format_type_t format, - int consensus_method, const vote_routerstatus_t *vrs); #endif /* !defined(TOR_FMT_ROUTERSTATUS_H) */ diff --git a/src/feature/nodelist/networkstatus.c b/src/feature/nodelist/networkstatus.c index f88b5e6d6..d0fada44d 100644 --- a/src/feature/nodelist/networkstatus.c +++ b/src/feature/nodelist/networkstatus.c @@ -2360,7 +2360,6 @@ char * networkstatus_getinfo_helper_single(const routerstatus_t *rs) { return routerstatus_format_entry(rs, NULL, NULL, NS_CONTROL_PORT, - ROUTERSTATUS_FORMAT_NO_CONSENSUS_METHOD, NULL); }

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 16 Jan '20

16 Jan '20

commit 96cf8bc71daf5d7c2fc3476c69f5533bcc22ad3d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 16 18:53:48 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index f2a57943d8..4a0c14f17b 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -4502,11 +4502,15 @@ msgid "" "usage - you may need to experiment with which values make your connection " "comfortable." msgstr "" +"Иначе может случиться, что вы будете терять много пакетов данных в моменты " +"максимальной нагрузки на канал. Возможно, стоит поэкспериментировать с " +"разными значениями и опытным путем определить, какие настройки обеспечат " +"комфортное подключение." #: https//support.torproject.org/operators/bandwidth-shaping/ #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description) msgid "Then set BandwidthBurst to the same as BandwidthRate." -msgstr "" +msgstr "Затем укажите BandwidthBurst равным BandwidthRate." #: https//support.torproject.org/operators/bandwidth-shaping/ #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description) @@ -4515,6 +4519,10 @@ msgid "" "prioritize Tor traffic below other traffic on their machine, so that their " "own personal traffic is not impacted by Tor load." msgstr "" +"Если узел Tor находится на компьютере Linux, у владельца есть еще один " +"вариант. Он может установить низкий приоритет трафика Tor по сравнению с " +"остальным трафиком на компьютере. Таким образом увеличение загрузки канала " +"Tor не скажется на личном трафике владельца." #: https//support.torproject.org/operators/bandwidth-shaping/ #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description) @@ -4523,6 +4531,9 @@ msgid "" "/operator-tools/linux-tor-prio.sh) can be found in the Tor source " "distribution's contrib directory." msgstr "" +"[Соответствующий скрипт](https://gitweb.torproject.org/tor.git/tree/contrib" +"/operator-tools/linux-tor-prio.sh) можно найти в contrib-папке дистрибутива " +"исходного кода Tor." #: https//support.torproject.org/operators/bandwidth-shaping/ #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 16 Jan '20

16 Jan '20

commit da3b5c8ab58c7260ebb3215d3a7e076fe254a534 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 16 18:23:42 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ru.po | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/contents+ru.po b/contents+ru.po index e2a7297eb9..f2a57943d8 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -2068,6 +2068,8 @@ msgid "" "the top-right of the browser, next to the URL bar), then click on " "\"Preferences\", and finally on \"Tor\" in the side bar." msgstr "" +"В Tor Browser нажмите кнопку \"гамбургера\" в правом верхнем углу. Выберите " +"в меню \"Настройки\", а в левом столбце \"Tor\"." #: https//support.torproject.org/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.description) @@ -2081,6 +2083,8 @@ msgid "" "At the bottom of the page, next to the \"View the Tor logs\" text, click the" " button \"View Logs...\"." msgstr "" +"В нижней части страницы найдите раздел журналов Tor и нажмите кнопку " +"\"Просмотр журналов...\"." #: https//support.torproject.org/tbb/tbb-21/ #: (content/tbb/tbb-21/contents+en.lrquestion.description) @@ -2088,6 +2092,8 @@ msgid "" "You should see an option to copy the log to your clipboard, which you will " "be able to paste it into a text editor or an email client." msgstr "" +"Вы можете скопировать лог в буфер обмена, а потом вставить в текстовый " +"редактор или клиент электронной почты." #: https//support.torproject.org/tbb/tbb-22/ #: (content/tbb/tbb-22/contents+en.lrquestion.title) @@ -2273,7 +2279,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) msgid "Both options are located in the hamburger menu." -msgstr "" +msgstr "Обе опции можно найти в меню \"гамбургера\"." #: https//support.torproject.org/tbb/tbb-29/ #: (content/tbb/tbb-29/contents+en.lrquestion.description) @@ -4485,6 +4491,9 @@ msgid "" "cable modem, you should set BandwidthRate to less than your smaller " "bandwidth (Usually that's the upload bandwidth)." msgstr "" +"Если у вас ассимметричное соединение с интернетом (исходящий канал меньше " +"входящего), например, кабельный модем, вам лучше сделать BandwidthRate " +"меньше меньшего (обычно меньше ширины исходящего канала)." #: https//support.torproject.org/operators/bandwidth-shaping/ #: (content/operators/bandwidth-shaping/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 16 Jan '20

16 Jan '20

commit 78b6493680c502886adab310f5980999f9b77860 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 16 17:54:18 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 6 +++--- contents+ru.po | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 3c915ae349..4672a74770 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -4,8 +4,8 @@ # erinm, 2019 # Emma Peel, 2019 # David Georges, 2019 -# AO <ao(a)localizationlab.org>, 2020 # PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2020 +# AO <ao(a)localizationlab.org>, 2020 # msgid "" msgstr "" @@ -13,7 +13,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2020-01-15 15:15+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: PoorPockets McNewHold <poorpocketsmcnewhold(a)protonmail.ch>, 2020\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2020\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -7583,7 +7583,7 @@ msgid "" "ScrambleSuit is similar to obfs4 but has a different set of " "[bridges](#bridge)." msgstr "" -"ScrambleSuit est similaire à obfs4 mais a un ensemble différent de " +"ScrambleSuit est semblable à obfs4, mais offre un ensemble différent de " "[ponts](#bridge)." #: https//support.torproject.org/misc/glossary/ diff --git a/contents+ru.po b/contents+ru.po index 94ed840d22..e2a7297eb9 100644 --- a/contents+ru.po +++ b/contents+ru.po @@ -2767,9 +2767,9 @@ msgid "" "choose between different search providers, it fell back to delivering Bing " "search results, which were basically unacceptable quality-wise." msgstr "" -"Disconnect – мета-поисковая машина, то есть, давал пользователям выбор между" -" различными поисковыми сервисами. Но он тяготел к поисковым результатам " -"Bing, которые не соответствовали нашим представлениям о качестве." +"Disconnect – мета-поисковик, дает пользователям выбор между различными " +"поисковыми сервисами. Но Disconnect тяготел к поисковым результатам Bing, " +"которые не соответствовали нашим представлениям о качестве." #: https//support.torproject.org/tbb/tbb-42/ #: (content/tbb/tbb-42/contents+en.lrquestion.title)

1 0