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

[ahf at torproject.org]

commit 0c5128eeb24c5f9e6b62117eb668f0c7679d0fc3
Merge: d496a75026 12c3787305
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon Oct 25 21:02:55 2021 +0000

    Merge branch 'maint-0.4.5' into maint-0.4.6

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