commit 0ccdf2f31e52bde1dc9556a4c938c494e784c79c Merge: 9a1338d b7566d4 Author: Nick Mathewson nickm@torproject.org Date: Fri Jul 14 15:07:09 2017 -0400

Merge branch 'bug17750_029_squashed'

changes/bug22924 | 4 ++++ src/test/test_dir.c | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-)