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

[dgoulet at torproject.org]

commit 51103450e4a997aa5a31cf9d60b3b22355525bd5
Merge: d6f3e2251 630bb113a
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Sep 4 08:33:27 2019 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

 Makefile.am         | 2 +-
 changes/ticket31554 | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)