commit da8ba5010b59ac3d55563df420711f862faeb2f8 Merge: 896a1ac50 758999511 Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 09:16:52 2019 -0400

Merge branch 'bug31107_035' into bug31107_040

changes/bug31107 | 4 ++++ src/core/or/channeltls.c | 10 +++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)