commit 48e990359b05661f2dd0ae503143ee9b18442475 Merge: 102178e6d a0db5ade3 Author: teor teor@torproject.org Date: Sat Apr 6 09:33:11 2019 +1000

Merge branch 'maint-0.2.9' into maint-0.3.4

changes/bug30021 | 8 ++++++++ src/common/tortls.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-)