Merge branch 'maint-0.3.5' into maint-0.4.5
commit49c758af47ce5e45154dbf445519b422d79f30ad
authorDavid Goulet <dgoulet@torproject.org>
Tue, 18 Jan 2022 18:15:29 +0000 (18 13:15 -0500)
committerDavid Goulet <dgoulet@torproject.org>
Tue, 18 Jan 2022 18:15:29 +0000 (18 13:15 -0500)
treef2ab4be8aa06b0772668e824fc8efde6a3c87678
parentaac5731f86399a3ac37720f9d0c4cffacd8eb38a
parente52348069133cd14b119e3c74d945cfb36771814
Merge branch 'maint-0.3.5' into maint-0.4.5
src/app/main/main.c