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

[nickm at torproject.org]

commit ef2ba568db1a404bbbd0ea35b5b61888b785120e
Merge: 0e8c16e22 7c92f4faa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Aug 24 16:29:23 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 .travis.yml      | 2 +-
 changes/bug31463 | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)