commit a5a6d470810635f06d3457cf315433c0df1f0ae3 Merge: 78bbbd9035 515d4f1e93 Author: David Goulet <dgoulet@torproject.org> Date: Mon Jul 13 15:03:53 2020 -0400 Merge branch 'maint-0.4.4' into release-0.4.4 Makefile.am | 3 +-- changes/ticket40030 | 7 +++++++ 2 files changed, 8 insertions(+), 2 deletions(-)