commit 0a824bd88998be66bfd8d55c7200fe3903e19739 Merge: 0878bb961 939657771 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 31 11:01:36 2018 -0400

Merge remote-tracking branch 'tor-github/pr/436' into maint-0.2.9

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