[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1346' into maint-0.4.1

[nickm at torproject.org]

commit d4dde249a04c768381767f67a1a82425bc70baaa
Merge: 6965798a1 d1eab0583
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Oct 22 12:11:50 2019 -0400

    Merge remote-tracking branch 'tor-github/pr/1346' into maint-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(-)