commit 6a167d21236c5437d03296daaf48fd9268e014ed Merge: 8970d7f7ae c731a4efec Author: George Kadianakis desnacked@riseup.net Date: Tue Dec 15 16:29:01 2020 +0200

Merge branch 'maint-0.4.5' into release-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(-)