commit 28ec2d9c2cbb300af8ba467898626020add977c4 Merge: 755c88a bf68c78 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 13 09:38:59 2017 -0400

Merge remote-tracking branch 'dgoulet/ticket21919_031_01'

src/ext/trunnel/trunnel.c | 2 +- src/or/hs_intropoint.c | 91 +++--- src/or/hs_intropoint.h | 4 +- src/or/hs_service.c | 42 +-- src/or/hs_service.h | 4 +- src/test/test_hs_intropoint.c | 102 +++---- src/test/test_hs_service.c | 14 +- src/trunnel/hs/cell_common.c | 179 ++++++------ src/trunnel/hs/cell_common.h | 207 +++++++------- src/trunnel/hs/cell_common.trunnel | 6 +- src/trunnel/hs/cell_establish_intro.c | 242 ++++++++-------- src/trunnel/hs/cell_establish_intro.h | 237 ++++++++-------- src/trunnel/hs/cell_establish_intro.trunnel | 10 +- src/trunnel/hs/cell_introduce1.c | 398 +++++++++++++------------- src/trunnel/hs/cell_introduce1.h | 416 ++++++++++++++-------------- src/trunnel/hs/cell_introduce1.trunnel | 14 +- 16 files changed, 988 insertions(+), 980 deletions(-)