Merge branch 'tor-github/pr/936'

diff --cc scripts/maint/practracker/exceptions.txt
index df19cc4702bc386ef20306a91fe255283236aedb,b84396272da37da683453fa1b5362c166fc77732..d90ed1f4bd77202b225f6810a1ec1b93b13cd196
--- 1/scripts/maint/practracker/exceptions.txt
--- 2/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -117,9 -117,9 +117,9 @@@ 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 3163
 +problem file-size /src/core/or/policies.c 3171
  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