commit cfb15d513dfdd64119d5e2aca94a61256bc2e00e Merge: 7082cc168 2a4b15697 Author: David Goulet dgoulet@torproject.org Date: Thu Jul 25 09:03:01 2019 -0400

Merge branch 'maint-0.4.1'

changes/bug31080_041 | 4 ++ src/feature/control/control_events.c | 2 +- src/feature/control/control_events.h | 3 +- src/lib/defs/include.am | 1 + src/lib/defs/logging_types.h | 23 ++++++++++ src/lib/err/.may_include | 3 +- src/lib/err/backtrace.c | 4 +- src/lib/err/backtrace.h | 7 ++- src/lib/log/.may_include | 1 + src/lib/log/log.c | 6 ++- src/lib/log/log.h | 83 ++++++++++++++++++------------------ src/rust/tor_log/tor_log.rs | 8 ++-- src/test/test_logging.c | 2 +- src/test/test_options.c | 4 +- src/test/testing_common.c | 2 +- 15 files changed, 95 insertions(+), 58 deletions(-)