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

[tor/release-0.4.4] Update the list of recommended protocol versions to match >=0.3.5.
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit b67f7d722d4cb94d1e77ff9b300c82d8c72b14c3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 11:00:58 2020 -0400 Update the list of recommended protocol versions to match >=0.3.5. Since Tor 0.2.9 has been unsupported since January, 0.3.5 is the oldest supported version, and its features constitute the oldest recommended feature-set. This patch updates these recommendations: DirCache=2 Support for consensus … [View More]diffs. New in 0.3.1.1-alpha. HSDir=2 Support for v3 onion service descriptors. New in 0.3.0.4-alpha. HSIntro=4 Support for Ed25519 intropoint authentication keys. New in 0.3.0-4-alpha. HSRend=2 Support for rendezvous cells longer than 20 bytes. New in 0.2.9.4-alpha. Link=5 Link padding and link padding negotiation. New in 0.3.3.2-alpha. LinkAuth=3 Ed25519 link authentication. New in 0.3.0.1-alpha. --- changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.h | 8 ++++---- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/changes/ticket32696 b/changes/ticket32696 new file mode 100644 index 000000000..8f56fc394 --- /dev/null +++ b/changes/ticket32696 @@ -0,0 +1,7 @@ + o Minor features (directory authority): + - Authorities now recommend protocol versions that are supported + by Tor 0.3.5 and later. (Earlier versions of Tor have been + deprecated since January of this year.) This recommendation + will cause older clients and relays to give a warning on startup, + or when they download a consensus directory. + Closes ticket 32696. diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index cf70e1184..1b1c9f2cc 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -239,14 +239,14 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_RELAY_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" + "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ + "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ #define DIRVOTE_RECOMMEND_CLIENT_PROTO \ - "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ - "Link=4 Microdesc=1-2 Relay=2" + "Cons=1-2 Desc=1-2 DirCache=2 HSDir=2 HSIntro=4 HSRend=2 " \ + "Link=5 LinkAuth=3 Microdesc=1-2 Relay=2" /** The required relay protocols for this authority's votes. * WARNING: Requiring a new protocol causes old tor versions to shut down. [View Less]

1 0

[tor/master] Merge branch 'tor-github/pr/1937' into maint-0.4.4
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit 523231516817a7037d150d583f3b83304c2686ec Merge: 3d0e1c42d b67f7d722 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 23 08:52:16 2020 -0400 Merge branch 'tor-github/pr/1937' into maint-0.4.4 changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 12 ++++++------ src/test/test_protover.c | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-)

1 0

[tor/release-0.4.4] Spelling fix: "RECCOMEND" => "RECOMMEND".
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit a82c0cdfcfefc1761883d7f25ecdea73d7216e16 Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Jun 17 10:37:47 2020 -0400 Spelling fix: "RECCOMEND" => "RECOMMEND". --- src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 4 ++-- src/test/test_protover.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/feature/dirauth/dirvote.c b/src/feature/dirauth/dirvote.c index 85a23a12f..79651563b 100644 --- a/src/feature/… [View More]dirauth/dirvote.c +++ b/src/feature/dirauth/dirvote.c @@ -4679,9 +4679,9 @@ dirserv_generate_networkstatus_vote_obj(crypto_pk_t *private_key, /* These are hardwired, to avoid disaster. */ v3_out->recommended_relay_protocols = - tor_strdup(DIRVOTE_RECCOMEND_RELAY_PROTO); + tor_strdup(DIRVOTE_RECOMMEND_RELAY_PROTO); v3_out->recommended_client_protocols = - tor_strdup(DIRVOTE_RECCOMEND_CLIENT_PROTO); + tor_strdup(DIRVOTE_RECOMMEND_CLIENT_PROTO); v3_out->required_relay_protocols = tor_strdup(DIRVOTE_REQUIRE_RELAY_PROTO); diff --git a/src/feature/dirauth/dirvote.h b/src/feature/dirauth/dirvote.h index fa7b1da4a..cf70e1184 100644 --- a/src/feature/dirauth/dirvote.h +++ b/src/feature/dirauth/dirvote.h @@ -238,13 +238,13 @@ STATIC microdesc_t *dirvote_create_microdescriptor(const routerinfo_t *ri, /** The recommended relay protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECCOMEND_RELAY_PROTO \ +#define DIRVOTE_RECOMMEND_RELAY_PROTO \ "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ "Link=4 Microdesc=1-2 Relay=2" /** The recommended client protocols for this authority's votes. * Recommending a new protocol causes old tor versions to log a warning. */ -#define DIRVOTE_RECCOMEND_CLIENT_PROTO \ +#define DIRVOTE_RECOMMEND_CLIENT_PROTO \ "Cons=1-2 Desc=1-2 DirCache=1 HSDir=1 HSIntro=3 HSRend=1 " \ "Link=4 Microdesc=1-2 Relay=2" diff --git a/src/test/test_protover.c b/src/test/test_protover.c index c33fbcae2..8fccae1a4 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -645,8 +645,8 @@ test_protover_vote_roundtrip_ours(void *args) (void) args; const char *examples[] = { protover_get_supported_protocols(), - DIRVOTE_RECCOMEND_RELAY_PROTO, - DIRVOTE_RECCOMEND_CLIENT_PROTO, + DIRVOTE_RECOMMEND_RELAY_PROTO, + DIRVOTE_RECOMMEND_CLIENT_PROTO, DIRVOTE_REQUIRE_RELAY_PROTO, DIRVOTE_REQUIRE_CLIENT_PROTO, }; [View Less]

1 0

[tor/release-0.4.4] Merge branch 'maint-0.4.4' into release-0.4.4
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit 107d70360d4735d6fde2aea97184c11ce167832e Merge: 961a08878 523231516 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 23 08:52:33 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 12 ++++++------ src/test/test_protover.c | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-)

1 0

[tor/release-0.4.4] Merge branch 'tor-github/pr/1937' into maint-0.4.4
by dgoulet＠torproject.org 23 Jun '20

23 Jun '20

commit 523231516817a7037d150d583f3b83304c2686ec Merge: 3d0e1c42d b67f7d722 Author: David Goulet <dgoulet(a)torproject.org> Date: Tue Jun 23 08:52:16 2020 -0400 Merge branch 'tor-github/pr/1937' into maint-0.4.4 changes/ticket32696 | 7 +++++++ src/feature/dirauth/dirvote.c | 4 ++-- src/feature/dirauth/dirvote.h | 12 ++++++------ src/test/test_protover.c | 4 ++-- 4 files changed, 17 insertions(+), 10 deletions(-)

1 0

[tpo/master] privchat - update donate link
by antonela＠torproject.org 23 Jun '20

23 Jun '20

commit 596b65547aec9f0708fcb092ca20786b063dbbd2 Author: Antonela <hola(a)antonela.me> Date: Tue Jun 23 08:59:03 2020 -0300 privchat - update donate link --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index 166864ba..e705435c 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -106,6 +106,6 @@ <div class="container"> <div class="row bg-secondary p-5 mx-1 … [View More]

1 0

[translation/torcheck_completed] https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed
by translation＠torproject.org 22 Jun '20

22 Jun '20

commit cd5bc339ceb6613f22a5d4d5f78f8f122182f307 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Jun 22 23:17:22 2020 +0000 https://gitweb.torproject.org/translation.git/commit/?h=torcheck_completed --- es_AR/torcheck.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/es_AR/torcheck.po b/es_AR/torcheck.po index e2aeee3fcb..c648028780 100644 --- a/es_AR/torcheck.po +++ b/es_AR/torcheck.po @@ -3,7 +3,7 @@ # # Translators: # … [View More]

1 0

[tpo/master] remove wrong word
by arma＠torproject.org 22 Jun '20

22 Jun '20

commit c93a266d63b59d48e6d7a6e5864cccf2f7a72508 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Jun 22 18:22:17 2020 -0400 remove wrong word --- templates/privchat.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/privchat.html b/templates/privchat.html index 1b5cc1dc..166864ba 100644 --- a/templates/privchat.html +++ b/templates/privchat.html @@ -33,7 +33,7 @@ <p class="font-family-serif"> When the COVID-19 pandemic hit … [View More]

1 0

[tor/master] Fill in missing IPv6 addresses in extend cells
by nickm＠torproject.org 22 Jun '20

22 Jun '20

commit 48310a0e76b2d8d708190db62b3ee9fc290d33e4 Author: Neel Chauhan <neel(a)neelc.org> Date: Tue Jun 9 21:36:54 2020 -0700 Fill in missing IPv6 addresses in extend cells --- src/feature/relay/circuitbuild_relay.c | 52 ++++++++++++++++++++++++++++++++++ src/feature/relay/circuitbuild_relay.h | 2 ++ 2 files changed, 54 insertions(+) diff --git a/src/feature/relay/circuitbuild_relay.c b/src/feature/relay/circuitbuild_relay.c index b89866b47..9ecba05e8 100644 --- a/src/feature/… [View More]relay/circuitbuild_relay.c +++ b/src/feature/relay/circuitbuild_relay.c @@ -122,6 +122,52 @@ circuit_extend_add_ed25519_helper(struct extend_cell_t *ec) return 0; } +/* Make sure the extend cell <b>ec</b> has an IPv4 address if the relay + * supports in, and if not, fill it in. */ +STATIC int +circuit_extend_add_ipv4_helper(struct extend_cell_t *ec) +{ + IF_BUG_ONCE(!ec) { + return -1; + } + + const node_t *node = node_get_by_id((const char *) ec->node_id); + if (node) { + tor_addr_port_t node_ipv4; + node_get_prim_orport(node, &node_ipv4); + if (tor_addr_is_null(&ec->orport_ipv4.addr) && + !tor_addr_is_null(&node_ipv4.addr)) { + tor_addr_copy(&ec->orport_ipv4.addr, &node_ipv4.addr); + ec->orport_ipv4.port = node_ipv4.port; + } + } + + return 0; +} + +/* Make sure the extend cell <b>ec</b> has an IPv6 address if the relay + * supports in, and if not, fill it in. */ +STATIC int +circuit_extend_add_ipv6_helper(struct extend_cell_t *ec) +{ + IF_BUG_ONCE(!ec) { + return -1; + } + + const node_t *node = node_get_by_id((const char *) ec->node_id); + if (node) { + tor_addr_port_t node_ipv6; + node_get_pref_ipv6_orport(node, &node_ipv6); + if (tor_addr_is_null(&ec->orport_ipv6.addr) && + !tor_addr_is_null(&node_ipv6.addr)) { + tor_addr_copy(&ec->orport_ipv6.addr, &node_ipv6.addr); + ec->orport_ipv6.port = node_ipv6.port; + } + } + + return 0; +} + /* Check if the address and port in the tor_addr_port_t <b>ap</b> are valid, * and are allowed by the current ExtendAllowPrivateAddresses config. * @@ -412,6 +458,12 @@ circuit_extend(struct cell_t *cell, struct circuit_t *circ) if (circuit_extend_lspec_valid_helper(&ec, circ) < 0) return -1; + if (circuit_extend_add_ipv4_helper(&ec) < 0) + return -1; + + if (circuit_extend_add_ipv6_helper(&ec) < 0) + return -1; + /* Check the addresses, without logging */ const int ipv4_valid = circuit_extend_addr_port_is_valid(&ec.orport_ipv4, false, false, 0); diff --git a/src/feature/relay/circuitbuild_relay.h b/src/feature/relay/circuitbuild_relay.h index 078316153..dc0b886a3 100644 --- a/src/feature/relay/circuitbuild_relay.h +++ b/src/feature/relay/circuitbuild_relay.h @@ -73,6 +73,8 @@ onionskin_answer(struct or_circuit_t *circ, STATIC int circuit_extend_state_valid_helper(const struct circuit_t *circ); STATIC int circuit_extend_add_ed25519_helper(struct extend_cell_t *ec); +STATIC int circuit_extend_add_ipv4_helper(struct extend_cell_t *ec); +STATIC int circuit_extend_add_ipv6_helper(struct extend_cell_t *ec); STATIC int circuit_extend_lspec_valid_helper(const struct extend_cell_t *ec, const struct circuit_t *circ); STATIC const tor_addr_port_t * circuit_choose_ip_ap_for_extend( [View Less]

1 0

[tor/master] Merge branch 'pr_1930_squashed'
by nickm＠torproject.org 22 Jun '20

22 Jun '20

commit ceddc39c597c7d794cc4b875820e872fbaad5a4b Merge: 033f80442 5a89fd2a0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Jun 22 15:33:27 2020 -0400 Merge branch 'pr_1930_squashed' changes/ticket33816 | 4 ++ src/feature/relay/circuitbuild_relay.c | 52 ++++++++++++++++++++++++ src/feature/relay/circuitbuild_relay.h | 2 + src/test/test_circuitbuild.c | 73 ++++++++++++++++++++++++++++++++++ 4 files changed, 131 insertions(+)

1 0