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

[nickm at torproject.org]

commit 5e94c9384197f75b6007e3de1c833912fe8ecb6a
Merge: 04f210811 3ddfd5ff2
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 11:46:04 2018 -0400

    Merge branch 'maint-0.3.4' into release-0.3.4

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