commit 2d53168511eafe6ac28c38d3a6f95114af3ee7b3 Merge: 6684c6e17 e849881d3 Author: David Goulet <dgoulet@torproject.org> Date: Mon Mar 9 10:36:05 2020 -0400 Merge branch 'tor-github/pr/1723' changes/bug33087 | 7 ++++++ configure.ac | 1 + src/lib/err/torerr.c | 26 ++++++++++----------- src/lib/err/torerr.h | 2 +- src/lib/err/torerr_sys.c | 6 ++--- src/lib/log/log.c | 60 +++++++++++++++++------------------------------- src/lib/log/log.h | 2 +- src/lib/log/util_bug.c | 2 +- 8 files changed, 46 insertions(+), 60 deletions(-)