[tor-commits] [tor/master] Merge branch 'bug31571_040' into bug31571_041

[dgoulet at torproject.org]

commit abe1f4f23ea885b60d3a677f730d9ce11d8eb8cb
Merge: e3a458e44 0cee6f498
Author: teor <teor at torproject.org>
Date:   Wed Sep 4 13:57:36 2019 +1000

    Merge branch 'bug31571_040' into bug31571_041

 changes/bug31571        |  7 +++++++
 src/lib/err/backtrace.c | 42 +++++++++++++++++++++++++++++++-----------
 src/lib/err/backtrace.h |  1 +
 src/lib/err/torerr.c    | 11 +++++++++--
 4 files changed, 48 insertions(+), 13 deletions(-)

diff --cc src/lib/err/backtrace.c
index e6cbe3d32,8606f4217..75d5093c5
--- a/src/lib/err/backtrace.c
+++ b/src/lib/err/backtrace.c
@@@ -240,10 -237,11 +237,11 @@@ remove_bt_handler(void
  
  #ifdef NO_BACKTRACE_IMPL
  void
 -log_backtrace_impl(int severity, int domain, const char *msg,
 +log_backtrace_impl(int severity, log_domain_mask_t domain, const char *msg,
                     tor_log_fn logger)
  {
-   logger(severity, domain, "%s. (Stack trace not available)", msg);
+   logger(severity, domain, "%s: %s. (Stack trace not available)",
+          bt_version, msg);
  }
  
  static int