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

[dgoulet at torproject.org]

commit 5d1db8fdfd0bce3e95ab232641283467110a5eb0
Merge: 366bb3c427 c618c4f279
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Dec 8 09:15:06 2020 -0500

    Merge branch 'maint-0.4.5' into release-0.4.5

 changes/ticket40111 | 7 +++++++
 configure.ac        | 5 +++--
 src/app/include.am  | 6 ++++--
 3 files changed, 14 insertions(+), 4 deletions(-)