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

diff --cc src/lib/err/torerr.c
Simple merge

diff --cc src/lib/err/torerr_sys.c
Simple merge

diff --cc src/lib/log/log.c
Simple merge

diff --cc src/lib/log/log.h
Simple merge

diff --cc src/lib/log/util_bug.c
Simple merge