commit a0db5ade3e1e2b81ed1196eb98aeca53583fba64 Merge: e1955a2c5 1710f4bbd Author: teor teor@torproject.org Date: Sat Apr 6 09:28:58 2019 +1000

Merge remote-tracking branch 'tor-github/pr/902' into maint-0.2.9

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