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

[asn at torproject.org]

commit 9084a90b00e51c92595347f8ac796df93876dc1a
Merge: a44aca545 e39b53ef7
Author: George Kadianakis <desnacked at riseup.net>
Date:   Tue Apr 30 19:21:15 2019 +0300

    Merge branch 'tor-github/pr/936'

 changes/coverity_falsepos                | 4 ++++
 scripts/maint/practracker/exceptions.txt | 6 +++---
 src/core/or/protover.c                   | 3 ++-
 src/feature/rend/rendservice.c           | 1 +
 src/lib/net/address.c                    | 8 ++++++--
 5 files changed, 16 insertions(+), 6 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index df19cc470,b84396272..d90ed1f4b
--- a/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