Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1

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

diff --cc src/feature/relay/router.c
Simple merge

diff --cc src/lib/crypt_ops/crypto_openssl_mgt.c
Simple merge

diff --cc src/lib/thread/compat_threads.c
Simple merge