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

[tor/release-0.3.1] Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 84c4a2bc3f5c7f593d61888cbff19a7264bf69d3 Merge: 7c68b2f1a ff7e8531e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:24:02 2017 -0400 Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0 changes/bug20270 | 6 ++++++ src/or/dirserv.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.0] Report common reasons for rejecting a relay before uncommon ones
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit ff7e8531ec44ce5ebdb7506ab3133e566fddfc20 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue May 9 10:28:05 2017 -0400 Report common reasons for rejecting a relay before uncommon ones "You're running 0.2.2; upgrade!" is more sensible than "You have no ntor key!" Closes ticket 20270; bugfix on 0.2.9.3-alpha. --- changes/bug20270 | 6 ++++++ src/or/dirserv.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/changes/bug20270 b/changes/bug20270 new file mode 100644 index 000000000..d538a358d --- /dev/null +++ b/changes/bug20270 @@ -0,0 +1,6 @@ + o Minor bugfixes (directory authority): + - When rejecting a router descriptor because the relay is running an + obsolete version of Tor without ntor support, warn about the obsolete + tor version, not the missing ntor key. Fixes bug 20270; + bugfix on 0.2.9.3-alpha. + diff --git a/src/or/dirserv.c b/src/or/dirserv.c index fa3938b5e..0c707a92d 100644 --- a/src/or/dirserv.c +++ b/src/or/dirserv.c @@ -274,6 +274,13 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, return FP_REJECT; } + /* Check for the more usual versions to reject a router first. */ + const uint32_t r = dirserv_get_status_impl(d, router->nickname, + router->addr, router->or_port, + router->platform, msg, severity); + if (r) + return r; + /* dirserv_get_status_impl already rejects versions older than 0.2.4.18-rc, * and onion_curve25519_pkey was introduced in 0.2.4.8-alpha. * But just in case a relay doesn't provide or lies about its version, or @@ -324,9 +331,7 @@ dirserv_router_get_status(const routerinfo_t *router, const char **msg, } } - return dirserv_get_status_impl(d, router->nickname, - router->addr, router->or_port, - router->platform, msg, severity); + return 0; } /** Return true if there is no point in downloading the router described by

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit bf91b6e05fcc8195bb79272065aa2dbd2a2d7eeb Merge: 9b65d7f41 84c4a2bc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/release-0.3.0] Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 84c4a2bc3f5c7f593d61888cbff19a7264bf69d3 Merge: 7c68b2f1a ff7e8531e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:24:02 2017 -0400 Merge remote-tracking branch 'public/bug20270_029' into maint-0.3.0 changes/bug20270 | 6 ++++++ src/or/dirserv.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 026882fa3d718246153ba91150a43e7ad8a4bdfc Merge: 61ceb2622 bf91b6e05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1

1 0

[tor/release-0.3.0] Merge branch 'maint-0.3.0' into release-0.3.0
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 93d376d8b309f3e8c242ae562434c32cfdd0388f Merge: 7902c2fa0 84c4a2bc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug20270 | 6 ++++++ src/or/dirserv.c | 11 ++++++++--- 2 files changed, 14 insertions(+), 3 deletions(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.0' into maint-0.3.1
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 9b65d7f4159a70bc83399614548782b458d19851 Merge: 5a739e59a 7c68b2f1a Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

[tor/release-0.3.1] Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 2b94b0ea721f2bd0127d097860ef64b915e2781a Merge: f6ecda840 a6514b8a2 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:22:42 2017 -0400 Merge remote-tracking branch 'public/bug22245_024' into maint-0.2.9 changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.2.9' into maint-0.3.0
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 7c68b2f1a500cffbd51aaf534669e1c863de5ec5 Merge: 1d48712c2 2b94b0ea7 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:23:00 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug22245 | 5 +++++ src/or/hibernate.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)

1 0

[tor/release-0.3.1] Merge branch 'maint-0.3.1' into release-0.3.1
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 61ceb26229a516c8b7bf23831fc91e41261e13c5 Merge: 883d1957f 9b65d7f41 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:23:01 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1

1 0