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

[nickm at torproject.org]

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

    Merge branch 'maint-0.2.9' into release-0.2.9

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