commit 36ac47bd85b1c2c7077b7b008362f6b8da42e237 Merge: 25fa218 b860f82 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 11 10:10:15 2016 -0500

Merge remote-tracking branch 'public/bug18204_028'

changes/bug18204_028 | 3 +++ src/test/bt_test.py | 8 ++++++++ src/test/test_bt.sh | 6 +++--- 3 files changed, 14 insertions(+), 3 deletions(-)