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

[nickm at torproject.org]

commit bcc1a7180870368b69d51706226c2f667c482506
Merge: 038bc21f8 0a824bd88
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 31 11:01:40 2018 -0400

    Merge branch 'maint-0.2.9' into maint-0.3.3

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