commit 77c47417f20f5cdc18b495999c6e9e89536cb7e8 Merge: 5363d9b118 3ebf217009 Author: David Goulet dgoulet@torproject.org Date: Fri Oct 29 09:20:21 2021 -0400

Merge branch 'maint-0.4.5' into maint-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(-)