[tor-commits] [tor/master] Merge branch 'maint-0.3.1' into maint-0.3.2

[nickm at torproject.org]

commit 15b8c860d3c8eac8f560569a90e90ba517e1c6ae
Merge: e5acbbd16 ba7043921
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 09:19:28 2018 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

 src/test/test_dir.c | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)