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

[nickm@xxxxxxxxxxxxxx]

commit bdb3be0119a6a61f4c6f4093a7f4d0d96e7f5b45
Merge: 6f2b6ede1 68fe8826d
Author: Nick Mathewson <nickm@xxxxxxxxxxxxxx>
Date:   Tue May 19 09:39:04 2020 -0400

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



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits