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

[dgoulet at torproject.org]

commit b92a44db0f22fcdc2c3c255f97e67fa603f3b9f9
Merge: 5b18f82466 ec5611e876
Author: David Goulet <dgoulet at torproject.org>
Date:   Tue Jan 18 13:15:29 2022 -0500

    Merge branch 'maint-0.4.6' into release-0.4.6

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