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

[nickm at torproject.org]

commit 386876971447b12388582e6297069bfbdaf3e2d3
Merge: f141b861a b2e543bfe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 13 16:46:16 2020 -0400

    Merge branch 'maint-0.4.1' into release-0.4.1

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