commit 61bdc452b098acf681466204e51d49199067ff33 Merge: 7a45ef5 464783a Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 3 18:36:25 2016 -0400

Merge branch 'bug20551_028' into maint-0.2.8

changes/bug20551 | 3 +++ src/common/tortls.c | 8 ++++---- 2 files changed, 7 insertions(+), 4 deletions(-)