commit 624bccc35e524807349086cbf95616d52c3475c7 Merge: fae8bcb ac1ddd5 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Jun 5 16:35:40 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 src/test/test_link_handshake.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)