commit aca4d1524e28f31355108b9824893ea561e7609f Merge: 952ab81b5 6ed2c9e5f Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 13 16:46:16 2020 -0400
Merge branch 'maint-0.4.2' into release-0.4.2
changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)