Merge branch 'maint-0.3.4'

diff --cc src/or/hs_client.c
Simple merge

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

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