[tor-commits] [tor/master] Merge branch 'maint-0.4.2'

[nickm at torproject.org]

commit 48f734178362d3a8b490a23ceff202a2027a27fc
Merge: 13216f848 6da989cfe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 6 13:24:01 2020 -0500

    Merge branch 'maint-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(-)