Merge branch 'tor-github/pr/973'

diff --cc scripts/maint/practracker/exceptions.txt
index 70176ad896475edce11e9b85f6b3f09f834ec26f,0a5f3b16993d4525c56178459716baa44b79647a..efd903e68cbde2624576f1894886b843dbee47af
--- 1/scripts/maint/practracker/exceptions.txt
--- 2/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -117,12 -117,12 +117,12 @@@ problem include-count /src/core/or/conn
  problem function-size /src/core/or/connection_or.c:connection_or_group_set_badness_() 105
  problem function-size /src/core/or/connection_or.c:connection_or_client_learned_peer_id() 144
  problem function-size /src/core/or/connection_or.c:connection_or_compute_authenticate_cell_body() 235
- problem file-size /src/core/or/policies.c 3171
+ problem file-size /src/core/or/policies.c 3249
  problem function-size /src/core/or/policies.c:policy_summarize() 107
 -problem function-size /src/core/or/protover.c:protover_all_supported() 116
 +problem function-size /src/core/or/protover.c:protover_all_supported() 117
  problem file-size /src/core/or/relay.c 3173
  problem function-size /src/core/or/relay.c:circuit_receive_relay_cell() 123
 -problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 101
 +problem function-size /src/core/or/relay.c:relay_send_command_from_edge_() 112
  problem function-size /src/core/or/relay.c:connection_ap_process_end_not_open() 194
  problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell_not_open() 139
  problem function-size /src/core/or/relay.c:connection_edge_process_relay_cell() 520

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

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