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

[nickm at torproject.org]

commit 6ed2c9e5fa8c4699cd55bae51248ae24c4d43d3f
Merge: b50494233 b2e543bfe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 13 16:46:16 2020 -0400

    Merge branch 'maint-0.4.1' into maint-0.4.2

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