[tor-commits] [tor/release-0.4.0] Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4

[teor at torproject.org]

commit 6d057c56f170a7d72751b9557c78c2f6ee5735b9
Merge: d7a5fdcb7 4ab2e9a59
Author: teor <teor at torproject.org>
Date:   Wed Mar 27 10:01:45 2019 +1000

    Merge remote-tracking branch 'tor-github/pr/820' into maint-0.3.4

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