[tor-commits] [tor/release-0.4.2] Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

commit 216456299f5ce83aabef8dd7cb80f2b3d8acd484 Merge: fd8ce812b c8242e4c0 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 29 12:58:23 2020 -0400

Merge remote-tracking branch 'tor-github/pr/1722/head' into maint-0.4.2

changes/bug33087 | 4 ++++ src/lib/err/torerr.c | 31 ++----------------------------- src/lib/err/torerr.h | 1 - src/lib/err/torerr_sys.c | 5 +---- src/lib/log/log.c | 36 +++--------------------------------- src/lib/log/log.h | 1 - src/lib/log/util_bug.c | 4 +--- 7 files changed, 11 insertions(+), 71 deletions(-)