commit c2aea6134a3333bbace155f37fcabf8a5b4e2744 Merge: 1ae0839ef e849881d3 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 9 08:30:14 2020 -0400
Merge remote-tracking branch 'tor-github/pr/1723/head' into maint-0.4.3
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(-)