commit f954ae6883fcca3522e05fa24fb4b542ee62929c Merge: 8bef3a76a d4dde249a Author: Nick Mathewson nickm@torproject.org Date: Tue Oct 22 12:11:59 2019 -0400

Merge branch 'maint-0.4.1' into release-0.4.1

changes/bug31736 | 3 +++ src/app/config/config.c | 6 +++++- src/feature/relay/router.c | 4 ++++ src/lib/crypt_ops/crypto_openssl_mgt.c | 4 ++++ src/lib/lock/compat_mutex.c | 10 +++++++++- src/lib/lock/compat_mutex_pthreads.c | 16 +++++++++++++++- src/lib/thread/compat_threads.c | 10 +++++++++- src/lib/thread/threads.h | 12 +++++++++++- 8 files changed, 60 insertions(+), 5 deletions(-)