commit 902672eac6dc4cbdbdd7e410a6dc7580f0df7509 Merge: 63e39b2 f02868b Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 13 14:23:59 2017 -0400

Merge branch 'ticket21889_031_01_squashed'

src/or/circuitlist.c | 9 +- src/or/hs_circuitmap.c | 296 ++++++++++++++++++++++++++++++++---------- src/or/hs_circuitmap.h | 69 +++++++--- src/or/hs_intropoint.c | 4 +- src/or/or.h | 14 +- src/or/rendmid.c | 16 ++- src/test/test_circuitlist.c | 136 ++++++++++++++----- src/test/test_hs_intropoint.c | 11 +- 8 files changed, 416 insertions(+), 139 deletions(-)

diff --cc src/test/test_hs_intropoint.c index 6e68e2c,40d1f25..5caa550 --- a/src/test/test_hs_intropoint.c +++ b/src/test/test_hs_intropoint.c @@@ -788,9 -789,9 +789,9 @@@ test_received_introduce1_handling(void /* Register the circuit in the map for the auth key of the cell. */ ed25519_public_key_t auth_key; const uint8_t *cell_auth_key = - hs_cell_introduce1_getconstarray_auth_key(cell); + trn_cell_introduce1_getconstarray_auth_key(cell); memcpy(auth_key.pubkey, cell_auth_key, ED25519_PUBKEY_LEN); - hs_circuitmap_register_intro_circ_v3(service_circ, &auth_key); + hs_circuitmap_register_intro_circ_v3_relay_side(service_circ, &auth_key); ret = hs_intro_received_introduce1(circ, request, request_len); circuit_free(TO_CIRCUIT(circ)); circuit_free(TO_CIRCUIT(service_circ));