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

[nickm at torproject.org]

commit ce2f38f05449b847799e4f9982ad3507d9a56e37
Merge: 72f06fc c1afbbe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 14 09:06:44 2017 -0400

    Merge branch 'maint-0.3.0' into release-0.3.0

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