[tor-commits] [tor/master] Merge branch 'bug33087_041' into bug33087_042

[dgoulet at torproject.org]

commit b6d1f99cb2ef422bb47d67acf7f8d982decb429b
Merge: ff5220536 2c0dfb093
Author: teor <teor at torproject.org>
Date:   Wed Feb 12 19:19:43 2020 +1000

    Merge branch 'bug33087_041' into bug33087_042

 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(-)