[tor-commits] [tor/master] Merge branch 'ticket34220_041' into ticket34220_042

[dgoulet at torproject.org]

commit c3f589c4d487577a92020fc942e5de7397cfe6bc
Merge: e75583e71 82d8304ef
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 3 14:49:03 2020 -0400

    Merge branch 'ticket34220_041' into ticket34220_042

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