commit f6a36996dbe31b813e52bd32959db2d1e35b012a Merge: 0203000 9919638 Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 5 17:37:14 2017 -0400

Merge branch 'maint-0.3.1' into release-0.3.1

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