commit df5c81fec0f25a684f1f7e68e80abcde5402d3ef Merge: bd11fb109 1b619a627 Author: Nick Mathewson nickm@torproject.org Date: Mon Dec 16 15:27:18 2019 -0500

Merge branch 'bug32765_041' into bug32771_042

changes/ticket32765 | 4 ++++ src/lib/log/util_bug.h | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-)