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

[nickm at torproject.org]

commit 158db532eb6423a87434599ff0a0c5fb46208e69
Merge: cf2cb783b bcc1a7180
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 31 11:01:41 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

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