Merge branch 'bug23361_032_01_squashed2'

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

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

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