commit a56d990fc45b0a32f7c9859f541b2f0d0e437ad8 Merge: 64e266b71 42507429c Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 21 12:22:37 2020 -0400

Merge branch 'maint-0.4.3' into release-0.4.3

changes/bug33918 | 3 +++ src/core/or/channeltls.c | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-)