commit f7c71dc53d7fc350c2107d0348ce4be772693126 Merge: 94e4a6b4f6 621f8ac418 Author: David Goulet dgoulet@torproject.org Date: Wed Nov 3 09:47:44 2021 -0400

Merge branch 'maint-0.4.6' into release-0.4.6

doc/asciidoc-helper.sh | 5 +++-- scripts/ci/ci-driver.sh | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-)