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

[nickm at torproject.org]

commit 39d3187b0d4997cb4b88fbf15be0b3260ac2ca3a
Merge: a7bd20eba 9e247ac27
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 18 16:39:10 2018 -0400

    Merge branch 'maint-0.3.3' into maint-0.3.4

 src/test/test_bt.sh | 2 ++
 1 file changed, 2 insertions(+)