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

[nickm at torproject.org]

commit 5eefa43137863057cf762192b47e4f979b4071a6
Merge: 05ca8ab bbc75fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Jul 14 09:06:44 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

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