Merge remote-tracking branch 'tor-github/pr/1685/head'

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

diff --cc scripts/maint/practracker/exceptions.txt
index 9d38cf9d3d4f7a8f3118d9c820fb9d0c48d33926,09c496c6dd5c4e0f6c35b118184e13c2ffc60954..b4ef1e51aaeef757ef43adb0832952be76e24f5f
--- 1/scripts/maint/practracker/exceptions.txt
--- 2/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -244,8 -248,9 +244,8 @@@ problem function-size /src/feature/hibe
  problem function-size /src/feature/hs/hs_cell.c:hs_cell_build_establish_intro() 115
  problem function-size /src/feature/hs/hs_cell.c:hs_cell_parse_introduce2() 152
  problem function-size /src/feature/hs/hs_client.c:send_introduce1() 103
 -problem function-size /src/feature/hs/hs_client.c:hs_config_client_authorization() 107
  problem function-size /src/feature/hs/hs_common.c:hs_get_responsible_hsdirs() 102
- problem function-size /src/feature/hs/hs_config.c:config_service_v3() 107
+ problem function-size /src/feature/hs/hs_config.c:config_service_v3() 128
  problem function-size /src/feature/hs/hs_config.c:config_generic_service() 138
  problem function-size /src/feature/hs/hs_descriptor.c:desc_encode_v3() 101
  problem function-size /src/feature/hs/hs_descriptor.c:decrypt_desc_layer() 111

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

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

diff --cc src/feature/nodelist/nodelist.h
Simple merge

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

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

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

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