commit f439d0fe4430a1d4c114afc788a1e03999a70e51 Merge: e0a96cf2b6 92fedb9f44 Author: David Goulet dgoulet@torproject.org Date: Fri Oct 29 09:20:21 2021 -0400

Merge branch 'maint-0.3.5' into release-0.3.5

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