commit f30f53e0992e78127602a15c27efd10060e45930 Merge: 368156fcb b558971c0 Author: David Goulet dgoulet@torproject.org Date: Wed Jul 1 12:26:19 2020 -0400

Merge branch 'tor-github/pr/1907'

changes/ticket28279 | 5 ++ src/feature/control/control_getinfo.c | 44 ++++++++++++++++++ src/feature/control/control_getinfo.h | 4 ++ src/feature/stats/rephist.c | 20 ++++++++ src/feature/stats/rephist.h | 3 ++ src/test/test_controller.c | 87 +++++++++++++++++++++++++++++++++++ 6 files changed, 163 insertions(+)