commit 7aa1e9b61b07324ff370ef0875d0d4a3bb821520 Merge: c502ce076 c4da0a509 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 9 08:33:36 2020 -0400

Merge branch 'maint-0.4.3' into release-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 +- src/lib/sandbox/sandbox.c | 1 + 9 files changed, 47 insertions(+), 60 deletions(-)