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

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

01 Aug '17

commit 751c71827364f1c5d7291cc379c8ba977df1bf37 Merge: bf91b6e05 f69797b67 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:40 2017 -0400 Merge branch 'maint-0.3.0' into maint-0.3.1

1 0

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

01 Aug '17

commit f69797b67cab3c5ad62d5a666b2919c3d29ef1e3 Merge: 84c4a2bc3 8500f0e4e Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:28:39 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0

1 0

[tor/release-0.2.9] Avoid a double-mark bug when makring a pending circuit as "too old"
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit ec5fe41209add4b216029466774a6b7e833210ef Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 15 09:19:00 2017 -0400 Avoid a double-mark bug when makring a pending circuit as "too old" Fixes bug 20059; bugfix on 0.1.0.1-rc. --- changes/bug20059 | 3 +++ src/or/onion.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/changes/bug20059 b/changes/bug20059 new file mode 100644 index 000000000..091fab06d --- /dev/null +++ b/changes/bug20059 @@ -0,0 +1,3 @@ + o Minor bugfixes (relay): + - Avoid a double-marked-circuit warning that can happen when we receive + DESTROY cells under heavy load. Fixes bug 20059; bugfix on 0.1.0.1-rc. diff --git a/src/or/onion.c b/src/or/onion.c index 1a0bcf106..de4b6a584 100644 --- a/src/or/onion.c +++ b/src/or/onion.c @@ -184,7 +184,9 @@ onion_pending_add(or_circuit_t *circ, create_cell_t *onionskin) onion_queue_entry_remove(head); log_info(LD_CIRC, "Circuit create request is too old; canceling due to overload."); - circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + if (! TO_CIRCUIT(circ)->marked_for_close) { + circuit_mark_for_close(TO_CIRCUIT(circ), END_CIRC_REASON_RESOURCELIMIT); + } } return 0; }

1 0

[tor/maint-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/maint-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/master] 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/maint-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/master] 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/maint-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/master] Merge branch 'maint-0.3.1'
by nickm＠torproject.org 01 Aug '17

01 Aug '17

commit 2ee1a084f2432a0bda8273a17b6fc9b5dbdc21f5 Merge: 069728bdd bf91b6e05 Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Aug 1 11:24:09 2017 -0400 Merge branch 'maint-0.3.1'

1 0