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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.1' into maint-0.4.2

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