From: Nick Mathewson <nickm@torproject.org>
Date: Thu, 13 Apr 2017 18:23:59 +0000 (-0400)
Subject: Merge branch 'ticket21889_031_01_squashed'
X-Git-Tag: tor-0.3.1.1-alpha~163
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=902672eac6dc4cbdbdd7e410a6dc7580f0df7509;p=thirdparty%2Ftor.git

Merge branch 'ticket21889_031_01_squashed'
---

902672eac6dc4cbdbdd7e410a6dc7580f0df7509
diff --cc src/test/test_hs_intropoint.c
index 6e68e2c867,40d1f25705..5caa550dd4
--- 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));