commit 3138fe2e694a7036d28427ee3d76e639d15e4bc0 Merge: bac160b4e d9e2db1ef Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 17:09:42 2017 -0400

Merge branch 'bug15582_029' into maint-0.2.9

changes/bug15582 | 4 ++++ src/test/test_util.c | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-)