commit 9d8b0c5bdc6f75891440dbe53e2572bf54e74aef Merge: d1493f2f27 a78dafbf7c Author: Alexander Færøy ahf@torproject.org Date: Mon Nov 8 14:16:19 2021 +0000

Merge branch 'maint-0.4.6' into main

changes/bug40429 | 5 +++++ changes/ticket40511 | 6 ++++++ configure.ac | 14 +++++++++++++- 3 files changed, 24 insertions(+), 1 deletion(-)