commit d867b7ae1dcd77ca7af64c3e5489644670b136f5 Merge: ef97e6c55 6a179b107 Author: George Kadianakis desnacked@riseup.net Date: Thu Apr 18 13:22:23 2019 +0300

Merge branch '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(-)