Merge branch 'tor-github/pr/1423'

diff --cc doc/tor.1.txt
Simple merge

diff --cc src/app/config/config.c
Simple merge

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

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

diff --cc src/feature/dirclient/dirclient.c
Simple merge

diff --cc src/feature/hs/hs_client.c
Simple merge

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