commit abd9ae48ac2306dc2784d9af2b34b883d83534f4 Merge: 01fdc3240 3c89622e3 Author: Nick Mathewson nickm@torproject.org Date: Fri Jan 17 07:50:50 2020 -0500

Merge branch 'ticket32487_squashed_and_merged'

changes/feature32487 | 3 + configure.ac | 10 +- doc/HACKING/Module.md | 12 ++- src/app/config/config.c | 13 ++- src/core/include.am | 2 +- src/core/mainloop/connection.c | 6 +- src/core/mainloop/mainloop.c | 8 +- src/feature/control/control_getinfo.c | 83 ++++++++++++++- src/feature/dircache/dircache_stub.c | 78 ++++++++++++++ src/feature/dircache/dirserv.c | 175 ++++++-------------------------- src/feature/dircache/dirserv.h | 39 +++++-- src/feature/dircache/include.am | 8 +- src/feature/dirclient/dirclient.c | 23 ++--- src/feature/dirclient/dirclient.h | 2 - src/feature/dirclient/dirclient_modes.c | 95 +++++++++++++++++ src/feature/dirclient/dirclient_modes.h | 24 +++++ src/feature/dirclient/include.am | 2 + src/feature/dircommon/directory.c | 31 ------ src/feature/dircommon/directory.h | 6 -- src/feature/nodelist/microdesc.c | 3 +- src/feature/nodelist/networkstatus.c | 7 +- src/feature/nodelist/node_select.c | 5 +- src/feature/nodelist/nodelist.c | 4 +- src/feature/nodelist/routerlist.c | 7 +- src/test/test_config.c | 27 ++--- 25 files changed, 422 insertions(+), 251 deletions(-)