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

[dgoulet at torproject.org]

commit 9da81112aea69302b670451c7963e5ac1c7e4203
Merge: 74599cdb31 77c47417f2
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Oct 29 09:20:21 2021 -0400

    Merge branch 'maint-0.4.6' into release-0.4.6

 Makefile.am            | 4 ++++
 changes/ticket26299    | 3 +++
 doc/asciidoc-helper.sh | 4 +++-
 doc/nofooter.conf      | 3 +++
 4 files changed, 13 insertions(+), 1 deletion(-)