commit c731a4efec3c7206bbbb8d2ba39c970fcb0c9f36 Merge: e74f168bb4 bd0046c9ec Author: George Kadianakis desnacked@riseup.net Date: Tue Dec 15 16:28:49 2020 +0200

Merge remote-tracking branch 'tor-gitlab/mr/205' into maint-0.4.5

src/lib/fs/conffile.c | 41 +++++++++++++++++++++++++++++++---------- src/lib/fs/path.c | 15 ++++++++++++++- src/lib/sandbox/sandbox.c | 39 ++++++++++++++++++++++++++++++++++++--- src/lib/sandbox/sandbox.h | 5 ++--- 4 files changed, 83 insertions(+), 17 deletions(-)