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

[nickm at torproject.org]

commit 0d124488f8a472d41528ffe0f0ed0e9437f31a16
Merge: 488969fe9 158db532e
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 31 11:02:58 2018 -0400

    Merge branch 'maint-0.3.4' into maint-0.3.5

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