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

[nickm at torproject.org]

commit 59043665f8b69b2caa8978269426d544b484fc98
Merge: 3a05b5acd 158db532e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 31 11:01:41 2018 -0400

    Merge branch 'maint-0.3.4' into maint-0.3.5

 changes/bug27948    |  6 ++++++
 src/test/bt_test.py | 10 ++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)