commit ae149b2b6343e6de5436ca207cdfc26425cda08f Merge: c2029e1da9 49c758af47 Author: David Goulet dgoulet@torproject.org Date: Tue Jan 18 13:15:29 2022 -0500

Merge branch 'maint-0.4.5' into release-0.4.5

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