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

[nickm at torproject.org]

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

    Merge branch 'maint-0.4.2' into maint-0.4.3

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