[tor-commits] [tor/master] Merge branch 'tor-github/pr/1346'

[asn at torproject.org]

commit 9318682109c5b8742bc868f3d30cb5cd39095f98
Merge: ae8d36db3 d1eab0583
Author: George Kadianakis <desnacked at riseup.net>
Date:   Mon Sep 30 13:56:51 2019 +0300

    Merge branch 'tor-github/pr/1346'

 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(-)

diff --cc src/app/config/config.c
index 6ee818ab0,2416da2b2..451593a5f
--- a/src/app/config/config.c
+++ b/src/app/config/config.c
@@@ -1197,9 -1187,28 +1197,13 @@@ init_protocol_warning_severity_level(vo
  static void
  cleanup_protocol_warning_severity_level(void)
  {
-    atomic_counter_destroy(&protocol_warning_severity_level);
+   /* Destroying a locked mutex is undefined behaviour. This mutex may be
+    * locked, because multiple threads can access it. But we need to destroy
+    * it, otherwise re-initialisation will trigger undefined behaviour.
+    * See #31735 for details. */
+   atomic_counter_destroy(&protocol_warning_severity_level);
  }
  
 -/** List of default directory authorities */
 -
 -static const char *default_authorities[] = {
 -#include "auth_dirs.inc"
 -  NULL
 -};
 -
 -/** List of fallback directory authorities. The list is generated by opt-in of
 - * relays that meet certain stability criteria.
 - */
 -static const char *default_fallbacks[] = {
 -#include "fallback_dirs.inc"
 -  NULL
 -};
 -
  /** Add the default directory authorities directly into the trusted dir list,
   * but only add them insofar as they share bits with <b>type</b>.
   * Each authority's bits are restricted to the bits shared with <b>type</b>.