commit 9556276f07e62e8b2e6a496e9b2a918293367839 Merge: 290007e3c4 623af0155e Author: David Goulet dgoulet@torproject.org Date: Thu Jan 28 12:46:24 2021 -0500

Merge branch 'tor-gitlab/mr/50' into maint-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(-)