commit 9ea0c0bfcdbed7734f49f20a032da7f978b48ad4 Merge: 39c5e1b84 1f163fcbd Author: Nick Mathewson nickm@torproject.org Date: Thu Jan 30 09:55:40 2020 -0500

Merge branch 'bug33093_logging_035'

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