commit 2ceea131406b3f88e4a6a9c6bfc9f47f4940ca47 Merge: d41025312a 304ae473ca Author: Nick Mathewson nickm@torproject.org Date: Wed Oct 7 09:42:37 2020 -0400

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

changes/bug40141 | 4 ++++ src/lib/fs/path.c | 13 ++++++++++++- 2 files changed, 16 insertions(+), 1 deletion(-)