commit 1eef543f9d9cde9754897047fb51ac7307b9827a Merge: 32854ae 464783a Author: Nick Mathewson nickm@torproject.org Date: Thu Nov 3 09:37:44 2016 -0400

Merge branch 'bug20551_028'

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