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

[dgoulet at torproject.org]

commit fadea75adaac5e9d760e996bb5e71df53daf17f9
Merge: 6eee995cc 0f218a05a
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Jun 12 12:55:41 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

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