]> git.ipfire.org Git - thirdparty/tor.git/commitdiff
Merge remote-tracking branch 'mike/bug31356+logs-rebased2' into bug31356_final
authorGeorge Kadianakis <desnacked@riseup.net>
Mon, 19 Aug 2019 14:53:00 +0000 (17:53 +0300)
committerGeorge Kadianakis <desnacked@riseup.net>
Mon, 19 Aug 2019 14:53:00 +0000 (17:53 +0300)
1  2 
scripts/maint/practracker/exceptions.txt
src/core/or/circuitpadding.c
src/test/test_circuitpadding.c

index 8e4618a72a9c7a08cd51cf089a79dd64c603e8c5,726dc9c3ef6eb7f67f5efd2bbb22e612a37b9a5c..a6f10a99a67702cb73a6669aca373acbddf03965
@@@ -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
Simple merge
Simple merge