commit 7fa624537cded3859a6f8408f9613bc53b6a1875 Merge: a617001fd 1ef084c5f Author: George Kadianakis desnacked@riseup.net Date: Tue Sep 3 17:11:25 2019 +0300

Merge branch 'tor-github/pr/1269'

src/feature/nodelist/routerset.c | 47 ++++++++++++++++++++++++++++++++++++++-- src/test/test_confparse.c | 4 ++++ 2 files changed, 49 insertions(+), 2 deletions(-)