commit de6ceb0bee8c1bf56d8929940a109bdc2a2d7521 Merge: 4f9a00339 03e77ef03 Author: teor teor@torproject.org Date: Wed Nov 6 11:19:46 2019 +1000

Merge branch 'maint-0.4.0' into maint-0.4.1

changes/bug31408 | 5 ++++ changes/bug31837 | 5 ++++ src/lib/fs/conffile.c | 10 +++++--- src/test/test_config.c | 68 +++++++++++++++++++++++++++++++++++++++++++++++++ src/test/test_rebind.py | 16 +++++++----- 5 files changed, 93 insertions(+), 11 deletions(-)