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

[nickm at torproject.org]

commit 3ddfd5ff25b1319dee3a013c8dac02ff9121971e
Merge: f8d5fb42a 825342825
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Sep 13 11:46:04 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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