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

[nickm at torproject.org]

commit 39d0e0cd0bef046601af30ca8136c964455b7519
Merge: 8e3d929 f2ca22f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Mar 1 07:52:51 2017 -0500

    Merge branch 'maint-0.3.0'

 src/test/test-network.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)