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

[nickm at torproject.org]

commit 9697c2da4680267038d407093cbcbc4c68059904
Merge: 5a8827a4c c02f2d9eb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 11:46:04 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.2

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