commit 45e0004b690b913dc991936ca0228a35fd5c7d1e Merge: 0a824bd88 1ba1a1cec Author: Nick Mathewson nickm@torproject.org Date: Fri Nov 9 10:49:43 2018 -0500

Merge branch 'bug28245_029' into maint-0.2.9

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