commit 755c88a4746b8b58d1b36486a611abc2d4f44144 Merge: 01fc93f ea5901b Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 13 09:22:34 2017 -0400

Merge branch 'asn/prop224-ntor-v2-squashed'

.gitignore | 2 + src/or/hs_ntor.c | 626 +++++++++++++++++++++++++++++++++++++++++++++ src/or/hs_ntor.h | 77 ++++++ src/or/include.am | 2 + src/test/hs_ntor_ref.py | 408 +++++++++++++++++++++++++++++ src/test/include.am | 17 +- src/test/test_hs_ntor.sh | 11 + src/test/test_hs_ntor_cl.c | 255 ++++++++++++++++++ src/test/test_hs_service.c | 97 +++++++ 9 files changed, 1493 insertions(+), 2 deletions(-)