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

[nickm at torproject.org]

commit 5a918ced20942e6d09f3cddc54bb7893f319b8ed
Merge: 53abbc784 21531f35f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Aug 6 09:19:11 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 Makefile.am         | 9 ++++++---
 changes/ticket31311 | 3 +++
 2 files changed, 9 insertions(+), 3 deletions(-)