commit ef6568b832333c709e3b99a63838754fd99e0c56 Merge: 5c575c6f92 e523480691 Author: David Goulet dgoulet@torproject.org Date: Tue Jan 18 13:15:29 2022 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/ticket40544 | 3 +++ src/app/main/main.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)