[tor-commits] [tor/master] Merge branch 'maint-0.3.5'

[nickm at torproject.org]

commit 2a4506776e4eea824ac2cb39b6825d3b57bd852b
Merge: 672e26cad 59043665f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Oct 31 11:01:41 2018 -0400

    Merge branch 'maint-0.3.5'

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