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

Merge branch 'ticket21891_031_01_squashed'
---

b081a7ed21ae729f6e195715e130edaca3e0b7fe
diff --cc src/or/hs_service.c
index 71939e236b,5d69a1dfff..205ef11c92
--- a/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 */