commit 2b0d370788f9fccd7902f157497f2544f4ccc932 Merge: 0bef3a21c 9697c2da4 Author: Nick Mathewson nickm@torproject.org Date: Thu Sep 13 11:46:04 2018 -0400

Merge branch 'maint-0.3.2' into release-0.3.2

changes/bug27658 | 6 ++++++ src/ext/tinytest.c | 12 ++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-)