commit 7a72e71f74546715f30004474f5a4a482be46d7c Merge: 77c85360f 4fde7699e Author: teor teor@torproject.org Date: Mon Oct 21 15:24:22 2019 +1000
Merge remote-tracking branch 'tor-github/pr/1434'
changes/ticket31684 | 6 ++ src/feature/control/control_getinfo.c | 64 ++++++++++++---- src/feature/control/control_getinfo.h | 4 + src/feature/dircache/dirserv.c | 4 +- src/feature/dircache/dirserv.h | 2 +- src/feature/nodelist/networkstatus.c | 8 +- src/feature/nodelist/networkstatus.h | 3 + src/lib/fs/mmap.c | 16 ++-- src/lib/fs/mmap.h | 5 +- src/test/test_controller.c | 137 ++++++++++++++++++++++++++++++++++ 10 files changed, 216 insertions(+), 33 deletions(-)