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

[nickm at torproject.org]

commit 68a2c75ab7ff74df2cf770d7f10427b71d942301
Merge: 93bd60e 9919638
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jul 5 17:37:14 2017 -0400

    Merge branch 'maint-0.3.1'

 src/or/networkstatus.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)