commit b9d71f3848a2858dc0a3c5232c85d97525aacd25 Merge: add387c50 1f163fcbd Author: Nick Mathewson <nickm@torproject.org> Date: Fri Mar 13 16:46:09 2020 -0400 Merge remote-tracking branch 'tor-github/pr/1693/head' into maint-0.3.5 changes/bug33093_logging | 5 +++++ src/lib/tls/buffers_tls.c | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-)