February 2021 - tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/293' into maint-0.4.5
by ahf＠torproject.org 12 Feb '21

12 Feb '21

commit d24a6b2f75caf7ba6e155d5b21516ce00dd9d30a Merge: 088a74aaab 841ee4641e Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 12 15:23:02 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/293' into maint-0.4.5 src/feature/relay/router.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/master] relay: Fix Coverity warning for unchecked returned value
by ahf＠torproject.org 12 Feb '21

12 Feb '21

commit 841ee4641ef75e2bb4c7400641ab257e67b6bcce Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 8 11:09:29 2021 -0500 relay: Fix Coverity warning for unchecked returned value Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/relay/router.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 4bc71eb486..60f237a700 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2673,9 +2673,13 @@ check_descriptor_ipaddress_changed(time_t now) /* Attempt to discovery the publishable address for the family which will * actively attempt to discover the address if we are configured with a - * port for the family. */ - relay_find_addr_to_publish(get_options(), family, RELAY_FIND_ADDR_NO_FLAG, - &current); + * port for the family. + * + * It is OK to ignore the returned value here since in the failure case, + * that is the address was not found, the current value is set to UNSPEC. + * Add this (void) so Coverity is happy. */ + (void) relay_find_addr_to_publish(get_options(), family, + RELAY_FIND_ADDR_NO_FLAG, &current); /* The "current" address might be UNSPEC meaning it was not discovered nor * found in our current cache. If we had an address before and we have

1 0

[tor/maint-0.4.5] relay: Fix Coverity warning for unchecked returned value
by ahf＠torproject.org 12 Feb '21

12 Feb '21

commit 841ee4641ef75e2bb4c7400641ab257e67b6bcce Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 8 11:09:29 2021 -0500 relay: Fix Coverity warning for unchecked returned value Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/relay/router.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 4bc71eb486..60f237a700 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2673,9 +2673,13 @@ check_descriptor_ipaddress_changed(time_t now) /* Attempt to discovery the publishable address for the family which will * actively attempt to discover the address if we are configured with a - * port for the family. */ - relay_find_addr_to_publish(get_options(), family, RELAY_FIND_ADDR_NO_FLAG, - &current); + * port for the family. + * + * It is OK to ignore the returned value here since in the failure case, + * that is the address was not found, the current value is set to UNSPEC. + * Add this (void) so Coverity is happy. */ + (void) relay_find_addr_to_publish(get_options(), family, + RELAY_FIND_ADDR_NO_FLAG, &current); /* The "current" address might be UNSPEC meaning it was not discovered nor * found in our current cache. If we had an address before and we have

1 0

[tor/release-0.4.5] Merge branch 'maint-0.4.5' into release-0.4.5
by ahf＠torproject.org 12 Feb '21

12 Feb '21

commit 8e493f321ae4036ba32bbd69c9e8270758890e3c Merge: 14bd196eb8 d24a6b2f75 Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 12 15:23:34 2021 +0000 Merge branch 'maint-0.4.5' into release-0.4.5 src/feature/relay/router.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[tor/release-0.4.5] relay: Fix Coverity warning for unchecked returned value
by ahf＠torproject.org 12 Feb '21

12 Feb '21

commit 841ee4641ef75e2bb4c7400641ab257e67b6bcce Author: David Goulet <dgoulet(a)torproject.org> Date: Mon Feb 8 11:09:29 2021 -0500 relay: Fix Coverity warning for unchecked returned value Signed-off-by: David Goulet <dgoulet(a)torproject.org> --- src/feature/relay/router.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/feature/relay/router.c b/src/feature/relay/router.c index 4bc71eb486..60f237a700 100644 --- a/src/feature/relay/router.c +++ b/src/feature/relay/router.c @@ -2673,9 +2673,13 @@ check_descriptor_ipaddress_changed(time_t now) /* Attempt to discovery the publishable address for the family which will * actively attempt to discover the address if we are configured with a - * port for the family. */ - relay_find_addr_to_publish(get_options(), family, RELAY_FIND_ADDR_NO_FLAG, - &current); + * port for the family. + * + * It is OK to ignore the returned value here since in the failure case, + * that is the address was not found, the current value is set to UNSPEC. + * Add this (void) so Coverity is happy. */ + (void) relay_find_addr_to_publish(get_options(), family, + RELAY_FIND_ADDR_NO_FLAG, &current); /* The "current" address might be UNSPEC meaning it was not discovered nor * found in our current cache. If we had an address before and we have

1 0

[tor/release-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/293' into maint-0.4.5
by ahf＠torproject.org 12 Feb '21

12 Feb '21

commit d24a6b2f75caf7ba6e155d5b21516ce00dd9d30a Merge: 088a74aaab 841ee4641e Author: Alexander Færøy <ahf(a)torproject.org> Date: Fri Feb 12 15:23:02 2021 +0000 Merge remote-tracking branch 'tor-gitlab/mr/293' into maint-0.4.5 src/feature/relay/router.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)

1 0

[community/master] Fix tor restart command
by gus＠torproject.org 12 Feb '21

12 Feb '21

commit 4b7d740991e935e69ac8cc4b35592f17b274e4f4 Author: gus <gus(a)torproject.org> Date: Fri Feb 12 08:20:08 2021 -0500 Fix tor restart command --- content/onion-services/setup/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/onion-services/setup/contents.lr b/content/onion-services/setup/contents.lr index e00cfd8..807ed06 100644 --- a/content/onion-services/setup/contents.lr +++ b/content/onion-services/setup/contents.lr @@ -88,7 +88,7 @@ HiddenServicePort 80 unix:/var/run/tor-my-website.sock Now save your `torrc` and restart Tor. -`$ sudo systemctl tor restart` +`$ sudo systemctl restart tor` If Tor starts up again, great. Otherwise, something is wrong. First look at your logfiles for hints. It will print some warnings or error messages. That should give you an idea of what went wrong.

1 0

[tor/master] Merge remote-tracking branch 'tor-gitlab/mr/294' into maint-0.4.5
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 088a74aaab84c5598f589fa6d0b6203ca8c666fa Merge: 58b5300f44 8d80126eee Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 12 13:53:45 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/294' into maint-0.4.5 changes/ticket40221_045 | 6 ++++++ src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- src/test/test_protover.c | 3 --- 4 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/maint-0.4.5] Merge remote-tracking branch 'tor-gitlab/mr/294' into maint-0.4.5
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 088a74aaab84c5598f589fa6d0b6203ca8c666fa Merge: 58b5300f44 8d80126eee Author: George Kadianakis <desnacked(a)riseup.net> Date: Fri Feb 12 13:53:45 2021 +0200 Merge remote-tracking branch 'tor-gitlab/mr/294' into maint-0.4.5 changes/ticket40221_045 | 6 ++++++ src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- src/test/test_protover.c | 3 --- 4 files changed, 9 insertions(+), 6 deletions(-)

1 0

[tor/master] Remove DirCache=1 from list of supported versions.
by asn＠torproject.org 12 Feb '21

12 Feb '21

commit 8d80126eee396b503e464f2647b7ca00fd9db6c0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Feb 8 11:40:35 2021 -0500 Remove DirCache=1 from list of supported versions. Closes #40221 --- changes/ticket40221_045 | 6 ++++++ src/core/or/protover.c | 2 +- src/rust/protover/protover.rs | 4 ++-- src/test/test_protover.c | 3 --- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/changes/ticket40221_045 b/changes/ticket40221_045 new file mode 100644 index 0000000000..0f3ab894c2 --- /dev/null +++ b/changes/ticket40221_045 @@ -0,0 +1,6 @@ + o Minor features (protocol versions): + - Stop claiming to support the "DirCache=1" subprotocol version. + Technically, we stopped supporting this subprotocol back in + 0.4.5.1-alpha, but we needed to wait for the authorities to stop + listing it as "required" before we can drop support. Closes ticket + 40221. diff --git a/src/core/or/protover.c b/src/core/or/protover.c index 5a87ade3da..aa96cafff9 100644 --- a/src/core/or/protover.c +++ b/src/core/or/protover.c @@ -398,7 +398,7 @@ protover_get_supported_protocols(void) return "Cons=1-2 " "Desc=1-2 " - "DirCache=1-2 " + "DirCache=2 " "FlowCtrl=1 " "HSDir=1-2 " "HSIntro=3-5 " diff --git a/src/rust/protover/protover.rs b/src/rust/protover/protover.rs index 0060864a2e..da87509ffa 100644 --- a/src/rust/protover/protover.rs +++ b/src/rust/protover/protover.rs @@ -160,7 +160,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { cstr!( "Cons=1-2 \ Desc=1-2 \ - DirCache=1-2 \ + DirCache=2 \ FlowCtrl=1 \ HSDir=1-2 \ HSIntro=3-5 \ @@ -175,7 +175,7 @@ pub(crate) fn get_supported_protocols_cstr() -> &'static CStr { cstr!( "Cons=1-2 \ Desc=1-2 \ - DirCache=1-2 \ + DirCache=2 \ FlowCtrl=1 \ HSDir=1-2 \ HSIntro=3-5 \ diff --git a/src/test/test_protover.c b/src/test/test_protover.c index be3aeb5e40..dd65f4bbf5 100644 --- a/src/test/test_protover.c +++ b/src/test/test_protover.c @@ -467,9 +467,6 @@ test_protover_supported_protocols(void *arg) PROTOVER_HSDIR_V3)); /* No DirCache versions appear anywhere in the code. */ - tt_assert(protocol_list_supports_protocol(supported_protocols, - PRT_DIRCACHE, - PROTOVER_DIRCACHE_V1)); tt_assert(protocol_list_supports_protocol(supported_protocols, PRT_DIRCACHE, PROTOVER_DIRCACHE_V2));

1 0