[tor-commits] [tor/maint-0.4.6] Merge remote-tracking branch 'tor-gitlab/mr/486' into maint-0.3.5

[ahf at torproject.org]

commit 4914e0e1ccc9ce52ce6c96c53925a5e64f7c6ff6
Merge: 439e17180c 8beb560bfd
Author: Alexander Færøy <ahf at torproject.org>
Date:   Mon Nov 8 14:15:56 2021 +0000

    Merge remote-tracking branch 'tor-gitlab/mr/486' into maint-0.3.5

 changes/bug40429 | 5 +++++
 configure.ac     | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)