commit 5689caeda1090a77a46ee6d3cc97bec9ed7a74f7 Merge: 2a83cca83 45e0004b6 Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 9 10:49:47 2018 -0500

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug28245 | 6 ++++++ configure.ac | 1 + src/common/tortls.c | 17 +++++++++++++++++ 3 files changed, 24 insertions(+)