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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.0' into maint-0.3.1

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