commit 06951cb3fcb9fc098c0122a728c400eb6b68daf4 Merge: 4258728d5 3af9a5111 Author: George Kadianakis desnacked@riseup.net Date: Tue Mar 26 15:16:21 2019 +0200

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

changes/ticket29806 | 7 ++++++ src/feature/dirauth/bwauth.c | 8 +++++- src/test/test_dir.c | 59 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 73 insertions(+), 1 deletion(-)