commit dedafe95feff363b0dac086e1f034b88dc112952 Merge: 0729ba286 3138fe2e6 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 12 17:09:47 2017 -0400

Merge branch 'maint-0.2.9' into maint-0.3.0

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