commit 0575a182a633429e755dc4366eced76656461d9b Merge: 216456299 2a1f8ea2e Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 29 13:48:25 2020 -0400

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

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