[tor-commits] [tor/master] Merge branch 'tor-github/pr/973'

[asn at torproject.org]

commit 501d1ae0bd4638730c1ba050c9ddb47d7c438280
Merge: 3885e7b44 de91b8384
Author: George Kadianakis <desnacked at riseup.net>
Date:   Fri May 10 12:49:01 2019 +0300

    Merge branch 'tor-github/pr/973'

 changes/bug23588                         |   5 +
 scripts/maint/practracker/exceptions.txt |   2 +-
 src/core/or/policies.c                   |  78 ++++++++++
 src/core/or/policies.h                   |   2 +
 src/feature/hs/hs_common.c               |  90 ++++++------
 src/feature/hs/hs_config.c               |   9 --
 src/test/hs_test_helpers.c               |   3 -
 src/test/test_hs_client.c                |  11 ++
 src/test/test_policy.c                   | 235 +++++++++++++++++++++++++++++++
 9 files changed, 376 insertions(+), 59 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index 70176ad89,0a5f3b169..efd903e68
--- a/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