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

[nickm at torproject.org]

commit 2a9ffeb4753f1f13c1428223ae6c206c70d169d9
Merge: ab92fd590 b8bff426f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 14 10:20:08 2020 -0400

    Merge branch 'maint-0.4.2' into release-0.4.2

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