[tor-commits] [tor/release-0.4.3] Merge branch 'maint-0.4.3' into release-0.4.3

[nickm at torproject.org]

commit 2d331e30c6a34f168ae6c6df498218d1cda5c902
Merge: 577655d6b bdb3be011
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 19 09:39:12 2020 -0400

    Merge branch 'maint-0.4.3' into release-0.4.3

 changes/ticket34255_043        | 3 +++
 src/lib/conf/confdecl.h        | 6 +++---
 src/lib/container/smartlist.c  | 2 +-
 src/lib/string/compat_ctype.c  | 1 +
 src/lib/wallclock/time_to_tm.c | 1 +
 5 files changed, 9 insertions(+), 4 deletions(-)