Merge branch 'maint-0.3.2'

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

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

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

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

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

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

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

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