commit eb078a3bd5bc645177600aff7cbbe59d6e25c3a4 Merge: befddf6d2 dedafe95f Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 17:09:47 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

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