[tor-commits] [tor/release-0.3.1] Merge branch 'bug22803_030' into maint-0.3.0

[nickm at torproject.org]

commit c1afbbe8feff1b803f721079b59a00438676045e
Merge: 66c85cd 759154b
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 14 09:06:33 2017 -0400

    Merge branch 'bug22803_030' into maint-0.3.0

 changes/bug22803               | 3 +++
 src/test/test_link_handshake.c | 4 +++-
 2 files changed, 6 insertions(+), 1 deletion(-)