commit 43c119fedbdf599241cd2e3e4292ae5fd55d527c Merge: e543c4e20 a5cced2b7 Author: David Goulet dgoulet@torproject.org Date: Tue Apr 30 11:50:36 2019 -0400

Merge branch 'tor-github/pr/980'

Signed-off-by: David Goulet dgoulet@torproject.org

changes/ticket29984 | 5 + changes/ticket30091 | 4 + scripts/maint/practracker/exceptions.txt | 6 +- src/core/include.am | 1 + src/core/mainloop/connection.c | 1 + src/feature/control/control.c | 63 +- src/feature/control/control.h | 6 + src/feature/control/control_auth.c | 144 +-- src/feature/control/control_auth.h | 13 +- src/feature/control/control_cmd.c | 1431 ++++++++++++++------------- src/feature/control/control_cmd.h | 64 ++ src/feature/control/control_cmd_args_st.h | 52 + src/feature/control/control_connection_st.h | 3 +- src/feature/control/control_fmt.c | 88 -- src/feature/control/control_fmt.h | 4 - src/feature/control/control_getinfo.c | 16 +- src/feature/control/control_getinfo.h | 8 +- src/lib/encoding/confline.c | 13 + src/lib/encoding/confline.h | 2 + src/lib/encoding/include.am | 2 + src/lib/encoding/kvline.c | 72 +- src/lib/encoding/kvline.h | 2 + src/lib/encoding/qstring.c | 90 ++ src/lib/encoding/qstring.h | 18 + src/test/fuzz/fuzz_strops.c | 12 + src/test/test_config.c | 55 + src/test/test_controller.c | 185 ++++ 27 files changed, 1488 insertions(+), 872 deletions(-)