commit a1dec44723b4c2b38140b49efd0d30bb784626ae Merge: 9662a13d7 2a1f8ea2e Author: David Goulet dgoulet@torproject.org Date: Thu Jan 30 13:48:36 2020 -0500

Merge branch 'tor-github/pr/1697'

changes/bug33095_041 | 5 +++++ src/lib/log/util_bug.h | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-)