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

Merge branch 'maint-0.4.3'

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