Merge branch 'maint-0.3.3' into maint-0.3.4

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

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

diff --cc src/or/hs_service.h
Simple merge

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

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

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