commit 6747c62386964d961c3e98768e4dc9c51f8529de Merge: 2b3518b f6e5a65 Author: Nick Mathewson nickm@torproject.org Date: Mon Feb 27 11:20:39 2017 -0500
Merge branch 'bug21420_029_squashed' into maint-0.3.0
changes/bug21420 | 3 +++ src/common/tortls.c | 19 ++++++++++++++++--- 2 files changed, 19 insertions(+), 3 deletions(-)