commit a040b05890b4f5e74609c922f22a4bf5e9c61660 Merge: 374780733 eb078a3bd Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 17:09:47 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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