commit 9f642b5918b58be86a23b4a09f0a8f5c77c0d8f5 Merge: d52380f 9fea009 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 5 15:28:20 2017 -0400

Merge branch 'maint-0.2.9' into release-0.2.9

changes/bug22460_case2 | 8 ++++++++ src/common/tortls.c | 30 +++++++++++++++++++++++++++++- src/common/tortls.h | 2 ++ src/or/connection_or.c | 30 ++++++++++++++++++------------ src/test/test_link_handshake.c | 28 +++++++++++++++++++++++++++- 5 files changed, 84 insertions(+), 14 deletions(-)