Merge branch 'tor-github/pr/1000'

Signed-off-by: David Goulet <dgoulet@torproject.org>

diff --cc src/core/mainloop/connection.c
Simple merge

diff --cc src/core/or/circuitbuild.c
Simple merge

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

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