commit e1514420377b2290dfa52fa65374276a66973131 Merge: 11f1fe3aca 60c436d14d Author: Nick Mathewson nickm@torproject.org Date: Wed Aug 12 14:37:21 2020 -0400

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

.travis.yml | 4 +- changes/feature25140 | 3 + configure.ac | 5 +- doc/man/tor.1.txt | 14 +- scripts/codegen/fuzzing_include_am.py | 2 +- src/app/include.am | 4 +- src/config/torrc.sample.in | 13 +- src/lib/fs/conffile.c | 141 +++++++---- src/lib/fs/files.c | 16 ++ src/lib/fs/files.h | 2 + src/lib/fs/path.c | 362 ++++++++++++++++++++++++++++ src/lib/fs/path.h | 7 + src/lib/sandbox/sandbox.c | 2 + src/lib/string/util_string.c | 9 + src/lib/string/util_string.h | 1 + src/test/fuzz/include.am | 2 +- src/test/include.am | 24 +- src/test/test_config.c | 349 ++++++++++++++++++++++++++- src/test/test_helpers.c | 83 +++++++ src/test/test_helpers.h | 2 + src/test/test_include.py | 196 +++++++++++++++ src/test/test_include.sh | 111 +++++++++ src/test/test_util.c | 436 ++++++++++++++++++++++++++++++++++ src/tools/include.am | 8 +- 24 files changed, 1715 insertions(+), 81 deletions(-)