commit 00a9fafdbabe71f56d37ff4bc69d3920278d380b Merge: a1104a37a 1e46a391b Author: Nick Mathewson nickm@torproject.org Date: Fri Sep 7 09:15:19 2018 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug27344 | 4 ++++ configure.ac | 1 + src/common/tortls.c | 6 +++++- 3 files changed, 10 insertions(+), 1 deletion(-)