[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit 8dd9d631c924a9d5de6b9f4f33c862f8482522bb
Merge: 9f642b5 d561da1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 16:35:40 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

 src/test/test_link_handshake.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)