commit 7037fe116359a9424cb6a20d88f38c0a422ebd68 Merge: 8f5a3c046 b7ad8bcaa Author: David Goulet dgoulet@torproject.org Date: Wed Feb 20 12:06:39 2019 -0500

Merge branch 'tor-github/pr/700'

changes/bug29061 | 4 ++++ src/test/test_bt.sh | 2 -- src/test/test_bt_cl.c | 8 ++++++++ 3 files changed, 12 insertions(+), 2 deletions(-)