commit 882fd1f0d45656e0535e70b5e115281b39ac6307 Merge: a7fe37f1fa 4a24673436 Author: Alexander Færøy ahf@torproject.org Date: Mon Nov 8 14:16:18 2021 +0000

Merge branch 'maint-0.3.5' into maint-0.4.5

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