Merge remote-tracking branch 'tor-github/pr/1447'

diff --cc src/app/config/config.c
Simple merge

diff --cc src/core/mainloop/mainloop.c
Simple merge

diff --cc src/test/test_config.c
Simple merge

diff --cc src/test/test_confparse.c
Simple merge

diff --cc src/test/test_dir.c
Simple merge

diff --cc src/test/test_options.c
Simple merge