commit c53c0e82b4d2ff1df895f16f37a06d1c391fdaeb Merge: 2b33e8037e 06ccf12258 Author: David Goulet <dgoulet@torproject.org> Date: Tue Jul 14 11:35:05 2020 -0400 Merge branch 'tor-gitlab/mr/49' src/feature/nodelist/describe.c | 20 ++++++++++---------- src/feature/nodelist/describe.h | 4 ++-- src/test/test_nodelist.c | 16 ++++++++-------- 3 files changed, 20 insertions(+), 20 deletions(-)