[tor-commits] [tor/maint-0.4.2] Merge branch 'maint-0.3.5' into maint-0.4.1

[nickm at torproject.org]

commit b2e543bfe74bb5855a86429c61c0efc91d660719
Merge: c96cf1494 b9d71f384
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 13 16:46:16 2020 -0400

    Merge branch 'maint-0.3.5' into maint-0.4.1

 changes/bug33093_logging  | 5 +++++
 src/lib/tls/buffers_tls.c | 4 ++--
 2 files changed, 7 insertions(+), 2 deletions(-)