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

.gitignore

src/or/hs_ntor.c

src/or/hs_ntor.h

src/or/include.am

src/test/hs_ntor_ref.py

src/test/include.am

src/test/test_hs_ntor.sh

src/test/test_hs_ntor_cl.c

src/test/test_hs_service.c