commit 3ec07671c1d2a46d735d08e941ba922fe55e70d2 Merge: f25c604e97 9556276f07 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:46:30 2021 -0500

Merge branch 'maint-0.3.5' into release-0.3.5

changes/bug33781 | 7 +++++++ src/lib/fs/files.c | 8 +++++--- src/test/test_util.c | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 61 insertions(+), 3 deletions(-)