commit ce5d8c92dd6d1cbd71ceea562c5be74058ce0e28 Merge: ef4ea86 bbc75fa Author: Nick Mathewson <nickm@torproject.org> Date: Fri Jul 14 09:06:44 2017 -0400 Merge branch 'maint-0.3.1' changes/bug22803 | 3 +++ src/test/test_link_handshake.c | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-)