commit e160fc57f10da547982475b2d7dcabd594252e48 Merge: 9d9b8a5a0 158db532e Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 31 11:01:41 2018 -0400

Merge branch 'maint-0.3.4' into release-0.3.4

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