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

[dgoulet at torproject.org]

commit 630bb113a0825b4d4ef8a9447b4ff2557a571a1e
Merge: e3a458e44 664d1b436
Author: David Goulet <dgoulet at torproject.org>
Date:   Wed Sep 4 08:33:10 2019 -0400

    Merge branch 'tor-github/pr/1271' into maint-0.4.1

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