commit 31f8b4fa65b446a3ae4ce67051a7f0aabcd22a97 Merge: 68b6d8524 f487da518 Author: Nick Mathewson nickm@torproject.org Date: Mon Nov 25 07:58:02 2019 -0500
Merge branch 'stream-socks-auth' into bug19859_merged
changes/bug19859 | 2 + scripts/maint/practracker/exceptions.txt | 2 +- src/feature/control/control_events.c | 12 ++- src/feature/control/control_fmt.c | 93 ++++++++++++++++++++++ src/feature/control/control_fmt.h | 2 + src/test/test_controller_events.c | 131 +++++++++++++++++++++++++++++++ 6 files changed, 238 insertions(+), 4 deletions(-)
diff --cc scripts/maint/practracker/exceptions.txt index 1c3bf9cbe,63dde53f2..70e6a5519 --- a/scripts/maint/practracker/exceptions.txt +++ b/scripts/maint/practracker/exceptions.txt @@@ -200,11 -200,11 +200,11 @@@ problem function-size /src/feature/cont problem function-size /src/feature/control/control_auth.c:handle_control_authenticate() 186 problem function-size /src/feature/control/control_cmd.c:handle_control_extendcircuit() 150 problem function-size /src/feature/control/control_cmd.c:handle_control_add_onion() 256 -problem function-size /src/feature/control/control_cmd.c:add_onion_helper_keyarg() 117 +problem function-size /src/feature/control/control_cmd.c:add_onion_helper_keyarg() 118 - problem function-size /src/feature/control/control_events.c:control_event_stream_status() 118 + problem function-size /src/feature/control/control_events.c:control_event_stream_status() 124 problem include-count /src/feature/control/control_getinfo.c 54 problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_misc() 108 -problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_dir() 302 +problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_dir() 297 problem function-size /src/feature/control/control_getinfo.c:getinfo_helper_events() 234 problem function-size /src/feature/dirauth/bwauth.c:dirserv_read_measured_bandwidths() 121 problem file-size /src/feature/dirauth/dirvote.c 4700