[tor-commits] [tor/master] Merge remote-tracking branch 'tor-github/pr/1505'

[teor at torproject.org]

commit 648399d6c256d4a8870758e1fb85310a018403f9
Merge: a7b6c0146 7bd708998
Author: teor <teor at torproject.org>
Date:   Mon Dec 16 08:15:19 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/1505'

 Doxyfile.in                           |   3 +-
 changes/ticket30984                   |   4 +
 src/feature/control/control_cmd.c     | 142 ++++++++++++++++--------------
 src/feature/control/control_getinfo.c |  45 ++++------
 src/feature/control/control_proto.c   | 157 ++++++++++++++++++++++++++++++++++
 src/feature/control/control_proto.h   |  72 ++++++++++++++++
 src/lib/encoding/kvline.c             |  52 ++++++-----
 src/lib/encoding/kvline.h             |   1 +
 src/test/test_config.c                |  30 +++++++
 src/test/test_controller.c            |  71 +++++++++++++++
 10 files changed, 464 insertions(+), 113 deletions(-)