commit 5d0237ff232ac857ddc360dadb6c8baa79f0e01d Merge: 2ba047f 61bdc45 Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 3 18:36:37 2016 -0400

Merge branch 'maint-0.2.8' into release-0.2.8

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