commit 7e32db478b6619c8e25ad117a59361b1f5cdfa48 Merge: 79569d86b a4400a77a Author: Nick Mathewson <nickm@torproject.org> Date: Thu Aug 8 09:40:04 2019 -0400 Merge branch 'ticket31343_035' into ticket31343_040 src/feature/nodelist/routerlist.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)