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

[dgoulet at torproject.org]

commit 82d8304efa92cb55647eb0c6b87b90b9eaf103e0
Merge: 768ffb8f4 f49f1d6fb
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 3 14:49:03 2020 -0400

    Merge branch 'ticket34220_035' into ticket34220_041

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