commit fdcb065bf7b1002a4c5e81b345848f47562938a3 Merge: 070e82a02 dedafe95f Author: Nick Mathewson <nickm@torproject.org> Date: Tue Sep 12 17:09:47 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug15582 | 4 ++++ src/test/test_util.c | 21 ++++++++++++++++----- 2 files changed, 20 insertions(+), 5 deletions(-)