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

[nickm at torproject.org]

commit 0483f7f64c80fe18c922415ae6062149a2ebb9f7
Merge: 4c1c818ff 64c3c6a79
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 27 09:39:08 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 changes/bug27345    | 5 +++++
 src/test/include.am | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)