commit 59f4cae68c00e6b894e68d8cfefae295a8b9eb89 Merge: 3cd520a 61bdc45 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 3 18:36:43 2016 -0400

Merge branch 'maint-0.2.8' into maint-0.2.9

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