commit 73eebf4c8e763a6f308b7ee457ff10e89376bcd9 Merge: 1cc8c1e8a bcc1a7180 Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 31 11:01:41 2018 -0400

Merge branch 'maint-0.3.3' into release-0.3.3

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