commit e51b57ee047420b929c7d58de70df6ea5ca77565 Merge: 04cb2d401 802ac8ad6 Author: Nick Mathewson nickm@torproject.org Date: Wed Jun 5 16:16:34 2019 -0400

Merge remote-tracking branch 'tor-github/pr/952' into maint-0.4.0

changes/bug30189 | 4 ++++ src/lib/log/util_bug.c | 14 ++++++++++++++ src/lib/log/util_bug.h | 8 +++++--- 3 files changed, 23 insertions(+), 3 deletions(-)