commit c05ae61f26e74e9f7f74ccca7b190ce64490f603 Merge: 04b271af9f bd0046c9ec Author: George Kadianakis desnacked@riseup.net Date: Tue Dec 15 16:28:04 2020 +0200

Merge remote-tracking branch 'tor-gitlab/mr/205'

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(-)