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

[dgoulet at torproject.org]

commit 41c7646d695e9f9bc9e333c936c3333e7db1abf8
Merge: 27738a9cba 3ebf217009
Author: David Goulet <dgoulet at torproject.org>
Date:   Fri Oct 29 09:20:21 2021 -0400

    Merge branch 'maint-0.4.5' into release-0.4.5

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