From: George Kadianakis <desnacked@riseup.net>
Date: Mon, 19 Aug 2019 14:53:00 +0000 (+0300)
Subject: Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final
X-Git-Tag: tor-0.4.2.1-alpha~82^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=b257e8e5530b00b3b1eb5d778d7621dfa27a7aea;p=thirdparty%2Ftor.git

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

b257e8e5530b00b3b1eb5d778d7621dfa27a7aea
diff --cc scripts/maint/practracker/exceptions.txt
index 8e4618a72a,726dc9c3ef..a6f10a99a6
--- 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
+