[tor-commits] [tor/release-0.4.2] Merge branch 'maint-0.4.2' into release-0.4.2

[nickm at torproject.org]

commit 57390b76bf0a4dea8254f53df734cb1427ed3006
Merge: 51b4a4bd1 216456299
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 29 12:58:50 2020 -0400

    Merge branch 'maint-0.4.2' into release-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(-)