commit 4d7ce27105dfb7f04ef14a59d098d2f81363298c Merge: b5f39955d 6ee19e57c Author: Nick Mathewson nickm@torproject.org Date: Tue Sep 17 09:16:53 2019 -0400

Merge branch 'bug31107_041' into bug31107_master

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