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

[ahf at torproject.org]

commit 04788dcf40947a01f9b8f0315f6353318f46d026
Merge: 91c83d1e08 0c5128eeb2
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon Oct 25 21:03:14 2021 +0000

    Merge branch 'maint-0.4.6' into main

 changes/ticket40500     | 3 +++
 scripts/ci/ci-driver.sh | 7 +++----
 2 files changed, 6 insertions(+), 4 deletions(-)