[tor-commits] [tor/release-0.4.6] Merge branch 'maint-0.3.5' into maint-0.4.5

[dgoulet at torproject.org]

commit 49c758af47ce5e45154dbf445519b422d79f30ad
Merge: aac5731f86 e523480691
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jan 18 13:15:29 2022 -0500

    Merge branch 'maint-0.3.5' into maint-0.4.5

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