commit 219962964812f75cff3ab8cede254e71ea48dd7b Merge: e77ad795c 69a1f9c8a Author: George Kadianakis desnacked@riseup.net Date: Wed Sep 25 14:14:30 2019 +0300

Merge branch 'tor-github/pr/1345'

src/feature/dirauth/process_descs.c | 10 +++-- src/test/test_address.c | 89 ++++++++++++++++++++++++++++++------- 2 files changed, 78 insertions(+), 21 deletions(-)