Merge remote-tracking branch 'dgoulet/ticket17242_032_03-squashed'

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

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

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

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

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