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

[teor at torproject.org]

commit 37b0dd08aa4e7857687c732da19794ac5334df75
Merge: 3d1ff4732 f7688cb17
Author: teor <teor at torproject.org>
Date:   Tue Apr 2 11:45:08 2019 +1000

    Merge branch 'maint-0.2.9' into release-0.2.9

 changes/bug29703         |   4 +
 src/test/test-network.sh | 187 +++++++++++++----------------------------------
 2 files changed, 54 insertions(+), 137 deletions(-)