commit 51675f97d30e48da68f2cf538f7f805f51af4c36 Merge: 6cb8c0f 9459ae2 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 7 08:37:07 2017 -0500

Merge remote-tracking branch 'public/bug17404_024' into maint-0.2.4

changes/bug17404 | 6 ++++++ src/common/tortls.c | 4 ++++ 2 files changed, 10 insertions(+)