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

[nickm at torproject.org]

commit 72312cdbb166e2c0c9d4b6dba049f43c2d35ecdc
Merge: d41f1cd3e e63bfca5f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 14 10:20:08 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1

 .travis.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)