commit 3092c8bb3e5eef94016327a83b07bab1c4ab3694 Merge: 9c27f56cd eb078a3bd Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 17:09:47 2017 -0400

Merge branch 'maint-0.3.1'

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