[tor-commits] [tor/master] Merge branch 'bug22109'

[nickm at torproject.org]

commit 45530ed729e315218f9b5d11b15bb8167ddfc77c
Merge: 81c479323 f9155ff41
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 25 14:32:04 2017 -0400

    Merge branch 'bug22109'

 changes/bug22109    |  3 +++
 src/test/test_dir.c | 24 ++++++++++++++++++++++++
 2 files changed, 27 insertions(+)