[tor-commits] [tor/release-0.3.3] Merge branch 'maint-0.3.2' into maint-0.3.3

[nickm at torproject.org]

commit 8253428253109dabc35861cbaab23a44a22eb24d
Merge: 4fa46fca8 9697c2da4
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 11:46:04 2018 -0400

    Merge branch 'maint-0.3.2' into maint-0.3.3

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