[tor-commits] [tor/master] Merge branch 'ticket21891_031_01_squashed'

[nickm at torproject.org]

commit b081a7ed21ae729f6e195715e130edaca3e0b7fe
Merge: ba89520 0565f5a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Apr 13 16:43:13 2017 -0400

    Merge branch 'ticket21891_031_01_squashed'

 src/or/hs_common.c     |  34 ++++++++++
 src/or/hs_common.h     |  25 ++++++-
 src/or/hs_intropoint.c |   4 +-
 src/or/hs_service.c    |   4 +-
 src/or/rendservice.c   | 174 ++++++++++++++++++++++++-------------------------
 src/or/rendservice.h   |  12 +++-
 src/test/test_hs.c     |  20 ++++--
 7 files changed, 173 insertions(+), 100 deletions(-)

diff --cc src/or/hs_service.c
index 71939e2,5d69a1d..205ef11
--- 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 */