commit b23b8fa4a18e7830fcbf95a2621dbc6096d68da5 Merge: 0b82b5ee4 af30be951 Author: teor <teor@torproject.org> Date: Mon Jan 20 15:52:40 2020 +1000 Merge remote-tracking branch 'tor-github/pr/1673' changes/ticket20218 | 3 + src/feature/nodelist/fmt_routerstatus.c | 2 + src/feature/nodelist/networkstatus.c | 28 ++++-- src/feature/nodelist/networkstatus.h | 2 + src/feature/nodelist/routerstatus_st.h | 4 + src/test/test_nodelist.c | 165 ++++++++++++++++++++++++++++++++ 6 files changed, 196 insertions(+), 8 deletions(-)