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

[dgoulet at torproject.org]

commit 05af1e25a0d61b2d840d7d48efcaf51d6b4ebbf7
Merge: af46b1d8cd 0acc3ae879
Author: David Goulet <dgoulet at torproject.org>
Date:   Mon Jul 13 14:58:40 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 Makefile.am         | 3 +--
 changes/ticket40030 | 7 +++++++
 2 files changed, 8 insertions(+), 2 deletions(-)