[tor-commits] [tor/master] Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final

[nickm at torproject.org]

commit b257e8e5530b00b3b1eb5d778d7621dfa27a7aea
Merge: c214402a5 6deba34fe
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Aug 19 17:53:00 2019 +0300

    Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final

 changes/bug31356_and_logs                | 11 +++++
 scripts/maint/practracker/exceptions.txt |  1 +
 src/core/or/circuitpadding.c             | 81 +++++++++++++++++++++++---------
 src/core/or/or.h                         |  4 +-
 src/core/or/protover.c                   |  2 +-
 src/core/or/protover.h                   |  2 +
 src/core/or/versions.c                   |  5 +-
 src/rust/protover/protover.rs            |  4 +-
 src/test/test_circuitpadding.c           |  4 +-
 9 files changed, 82 insertions(+), 32 deletions(-)

diff --cc scripts/maint/practracker/exceptions.txt
index 8e4618a72,726dc9c3e..a6f10a99a
--- a/scripts/maint/practracker/exceptions.txt
+++ b/scripts/maint/practracker/exceptions.txt
@@@ -276,10 -279,11 +276,11 @@@ problem function-size /src/lib/process/
  problem function-size /src/lib/process/setuid.c:switch_id() 156
  problem function-size /src/lib/sandbox/sandbox.c:prot_strings() 104
  problem function-size /src/lib/string/scanf.c:tor_vsscanf() 112
 -problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 153
 -problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 171
 -problem function-size /src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 126
 +problem function-size /src/lib/tls/tortls_nss.c:tor_tls_context_new() 152
 +problem function-size /src/lib/tls/tortls_openssl.c:tor_tls_context_new() 170
 +problem function-size /src/lib/tls/x509_nss.c:tor_tls_create_certificate_internal() 121
  problem function-size /src/tools/tor-gencert.c:parse_commandline() 111
 -problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 104
 -problem function-size /src/tools/tor-resolve.c:do_resolve() 174
 +problem function-size /src/tools/tor-resolve.c:build_socks5_resolve_request() 102
 +problem function-size /src/tools/tor-resolve.c:do_resolve() 171
  problem function-size /src/tools/tor-resolve.c:main() 112
+