diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-11-25 08:53:46 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-11-25 08:53:46 -0500 |
| commit | be30c61ac1553cf4401c832019e213be907c0711 (patch) | |
| tree | 0dd1be56530d20a1e394ee6d5970034e0d37774d | |
| parent | 6cdd024c94ce9d2ba73cb393ccc84c6274c26d85 (diff) | |
| parent | 273b267fa234c5a26c9beaacede42a496c880e05 (diff) | |
| download | tor-be30c61ac1553cf4401c832019e213be907c0711.tar.gz tor-be30c61ac1553cf4401c832019e213be907c0711.zip | |
Merge branch 'maint-0.2.7'
| -rw-r--r-- | changes/bug16702 | 4 | ||||
| -rw-r--r-- | src/or/rendservice.c | 3 |
2 files changed, 6 insertions, 1 deletions
diff --git a/changes/bug16702 b/changes/bug16702 new file mode 100644 index 0000000000..5de36cd351 --- /dev/null +++ b/changes/bug16702 @@ -0,0 +1,4 @@ + o Minor bugfixes (hidden service) + - The wrong list was used when looking up expired intro points in a rend + service object causing what we think could be reachability issues and + triggering a BUG log. Fixes 16702; bugfix on tor-0.2.7.2-alpha. diff --git a/src/or/rendservice.c b/src/or/rendservice.c index da65c6793a..15d98bfde5 100644 --- a/src/or/rendservice.c +++ b/src/or/rendservice.c @@ -3038,7 +3038,8 @@ find_expiring_intro_point(rend_service_t *service, origin_circuit_t *circ) tor_assert(TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_ESTABLISH_INTRO || TO_CIRCUIT(circ)->purpose == CIRCUIT_PURPOSE_S_INTRO); - SMARTLIST_FOREACH(service->intro_nodes, rend_intro_point_t *, intro_point, + SMARTLIST_FOREACH(service->expiring_nodes, rend_intro_point_t *, + intro_point, if (crypto_pk_eq_keys(intro_point->intro_key, circ->intro_key)) { return intro_point; }); |