commit 6a179b1072887c5b8e9a2f679a6faf5504bbf3e3 Merge: c72f0cd5c 950d890f7 Author: George Kadianakis desnacked@riseup.net Date: Thu Apr 18 13:21:59 2019 +0300

Merge branch 'tor-github/pr/891' into maint-0.4.0

changes/diagnostic_28223_redux | 4 ++++ src/feature/dirparse/microdesc_parse.c | 17 ++++++++++++++++- src/feature/nodelist/microdesc.c | 28 ++++++++++++++++++++++++++++ src/lib/fdio/fdio.c | 4 ++++ 4 files changed, 52 insertions(+), 1 deletion(-)