[tor-commits] [tor/master] Merge remote-tracking branch 'dgoulet/ticket30454_035_01'

[nickm at torproject.org]

commit 24c2502070b695c047fa7ebd87ac436a98e0bb51
Merge: e6b862e6a 245dccb77
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 22 11:50:46 2019 -0400

    Merge remote-tracking branch 'dgoulet/ticket30454_035_01'

 changes/ticket30454                    | 10 ++++++++
 src/feature/hs/hs_cell.c               | 16 +++++++------
 src/feature/hs/hs_cell.h               | 13 ----------
 src/feature/hs/hs_client.c             | 18 +++++++-------
 src/feature/hs/hs_intropoint.c         | 27 +++++++++++----------
 src/feature/hs/hs_intropoint.h         | 15 ------------
 src/test/test_hs_cell.c                |  2 +-
 src/test/test_hs_intropoint.c          |  4 ++--
 src/trunnel/hs/cell_introduce1.c       | 44 +++++++++++++---------------------
 src/trunnel/hs/cell_introduce1.h       |  7 ++++++
 src/trunnel/hs/cell_introduce1.trunnel | 21 +++++++++++++---
 11 files changed, 87 insertions(+), 90 deletions(-)