commit 64b8ee3f9e0f2c70444f2aee0acf1433a791d82d Merge: 57390b76b 0575a182a Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 29 13:48:32 2020 -0400

Merge branch 'maint-0.4.2' into release-0.4.2

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