commit 79cb47cfc2ed83911f78fa24ba4205bf69958105 Merge: f058db1f3d 9556276f07 Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:46:31 2021 -0500

Merge branch 'maint-0.3.5' into maint-0.4.3

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