commit f8304cc6fb82d3a6bf4029f0352497c5b80eb609 Merge: 1e154d7a1 ee43bc706 Author: George Kadianakis desnacked@riseup.net Date: Tue Mar 26 01:25:11 2019 +0200

Merge branch 'maint-0.3.4' into release-0.3.4

changes/ticket29806 | 7 +++++++ src/or/dirserv.c | 8 +++++++- src/test/test_dir.c | 57 +++++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 71 insertions(+), 1 deletion(-)