commit bc50f082bd3a84156dd12db9e2186fd083b216c1 Merge: 2eae59e47 3adabaf3e Author: David Goulet dgoulet@torproject.org Date: Wed Jun 24 10:48:14 2020 -0400

Merge branch 'tor-github/pr/1944'

changes/ticket40006 | 6 ++++++ src/lib/tls/buffers_tls.c | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-)