[tor-commits] [tor/master] Merge branch 'maint-0.4.2' into maint-0.4.3

[dgoulet at torproject.org]

commit 272c171136f4ed7660ef409f75ce7bac29a004f3
Merge: 754d4e9a1 0f218a05a
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Jun 12 12:55:41 2020 -0400

    Merge branch 'maint-0.4.2' into maint-0.4.3

 .travis.yml | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)