commit 6338fc2afa729cc9c09a8e466c54cbd53031c8ca Merge: 683c794273 47d6eef190 Author: David Goulet dgoulet@torproject.org Date: Tue Oct 27 09:43:04 2020 -0400

Merge branch 'tor-gitlab/mr/173'

changes/ticket22668 | 3 +++ src/core/mainloop/connection.c | 15 ++++++++++++--- src/core/or/connection_or.c | 20 ++++++++++++++++++++ src/core/or/connection_or.h | 2 ++ src/feature/nodelist/describe.c | 33 ++++++++++++++++++++++++++++++--- src/feature/nodelist/describe.h | 18 ++++++++++++------ src/feature/nodelist/routerinfo.c | 16 ++++++++++++++++ src/feature/nodelist/routerinfo.h | 4 ++++ src/test/test_connection.c | 6 +++--- src/test/test_nodelist.c | 27 +++++++++++++++++++++++++-- 10 files changed, 127 insertions(+), 17 deletions(-)