Merge remote-tracking branch 'tor-gitlab/mr/29'

This commit is contained in:
Nick Mathewson
2020-07-10 12:53:46 -04:00
29 changed files with 893 additions and 110 deletions
+2
View File
@@ -324,3 +324,5 @@ problem function-size /src/tools/tor-gencert.c:parse_commandline() 111
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
problem dependency-violation /src/core/or/trace_probes_circuit.c 1
problem dependency-violation /src/core/or/trace_probes_circuit.h 1