Merge remote-tracking branch 'dgoulet/bug19899_030_01'

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

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

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