Merge branch 'ticket21889_031_01_squashed'

diff --cc src/or/hs_intropoint.c
Simple merge

diff --cc src/or/or.h
Simple merge

diff --cc src/test/test_hs_intropoint.c
index 6e68e2c8672de8f847998d1600658ce8e78ee79f,40d1f257054959b502c4a2178ef4d50442628587..5caa550dd42002a5b510f0e636bf06214c2df993
--- 1/src/test/test_hs_intropoint.c
--- 2/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));