[tor-commits] [tor/master] Merge branch 'pr_1931_squashed'

[nickm at torproject.org]

commit fd3e0c561db341c43acaec458dcefbd7b0992f8e
Merge: bc50f082b c3c7ef512
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 24 13:38:32 2020 -0400

    Merge branch 'pr_1931_squashed'

 changes/bug34065                 |  5 ++++
 src/feature/nodelist/routerset.c | 37 ++++++++++++++++----------
 src/test/test_routerset.c        | 56 +++++++++++++++++++++++++++++++++++++++-
 3 files changed, 84 insertions(+), 14 deletions(-)