commit 0e2834a3718a3932cfe8d3148d203a0604451073 Merge: d2e4262eb 0614f8390 Author: teor teor@torproject.org Date: Wed Nov 6 11:17:43 2019 +1000

Merge remote-tracking branch 'tor-github/pr/1348' into maint-0.3.5

changes/bug31408 | 5 ++++ src/lib/fs/conffile.c | 10 +++++--- src/test/test_config.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 79 insertions(+), 4 deletions(-)