Merge branch 'ticket20657_nickm_bugfixes_squashed'

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

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

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

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

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

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

diff --cc src/test/include.am
Simple merge

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