commit 9fea00928cb680f550a5ea9c64227efc025ea69b Merge: 80aca15 ec84fc1 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 5 15:28:13 2017 -0400

Merge branch 'bug22460_case2_029_01_squashed' into maint-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(-)