commit 7eef9ced61e72b1df02d3e9629d21e717fff74f7 Merge: ca389d22a1 83052372a0 Author: David Goulet dgoulet@torproject.org Date: Thu Sep 17 08:33:10 2020 -0400

Merge branch 'tor-gitlab/mr/131'

src/feature/nodelist/routerlist.c | 26 +++++++++++++++++++++----- 1 file changed, 21 insertions(+), 5 deletions(-)