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

diff --cc .gitignore
Simple merge

diff --cc src/or/include.am
Simple merge

diff --cc src/test/include.am
Simple merge

diff --cc src/test/test_hs_service.c
Simple merge