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

[nickm at torproject.org]

commit 5343d2b03c8158fcd9c8811e367e26ac6bfa9827
Merge: e3b1573 ac1ddd5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 5 16:35:40 2017 -0400

    Merge branch 'maint-0.3.0'

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