commit aa50758777ed4370f07e45a082dbeaa8c94620da Merge: ef61046 2c45e58 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 28 11:31:07 2017 -0500

Merge remote-tracking branch 'teor/test21470-029'

changes/test21470 | 5 ++ src/test/test_dir.c | 135 +++++++++++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 139 insertions(+), 1 deletion(-)