commit f1173a63fb905922a2ef13588a1999d85a24a9f6 Merge: 77188ef36 6da989cfe Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 6 13:24:01 2020 -0500

Merge branch 'maint-0.4.2' into release-0.4.2

changes/bug32771 | 4 ++++ changes/ticket32765 | 4 ++++ src/lib/confmgt/structvar.c | 4 ++-- src/lib/log/util_bug.h | 6 ++++-- 4 files changed, 14 insertions(+), 4 deletions(-)