commit fd31468ea14c6c8f659833ae0398e931f95fb1b3 Merge: 13155e241 de6ceb0be Author: teor teor@torproject.org Date: Wed Nov 6 11:19:50 2019 +1000

Merge branch 'maint-0.4.1' into release-0.4.1

changes/bug31408 | 5 ++++ changes/bug31837 | 5 ++++ changes/bug31897 | 3 +++ src/lib/fs/conffile.c | 10 +++++--- src/test/test_config.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ src/test/test_rebind.py | 16 +++++++----- src/test/test_util.c | 5 ++-- 7 files changed, 99 insertions(+), 13 deletions(-)