Merge branch 'ticket21891_031_01_squashed'

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

diff --cc src/or/hs_service.c
index 71939e236b6b368fac0aca9a37ec2833a40f557a,5d69a1dfffdc4b0cab16121612b0b3ce4166896f..205ef11c92e5b80bde7aa7428195c1f11f253bdd
--- 1/src/or/hs_service.c
--- 2/src/or/hs_service.c
+++ b/src/or/hs_service.c
@@@ -72,10 -73,11 +73,11 @@@ generate_establish_intro_cell(const uin
      goto err;
    }
  
 -  cell = hs_cell_establish_intro_new();
 +  cell = trn_cell_establish_intro_new();
  
    /* Set AUTH_KEY_TYPE: 2 means ed25519 */
-   trn_cell_establish_intro_set_auth_key_type(cell, AUTH_KEY_ED25519);
 -  hs_cell_establish_intro_set_auth_key_type(cell,
 -                                            HS_INTRO_AUTH_KEY_TYPE_ED25519);
++  trn_cell_establish_intro_set_auth_key_type(cell,
++                                             HS_INTRO_AUTH_KEY_TYPE_ED25519);
  
    /* Set AUTH_KEY_LEN field */
    /* Must also set byte-length of AUTH_KEY to match */