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

[nickm at torproject.org]

commit 3a5cf9aa2f50eccbdbbb6f7e04753479c7763e1b
Merge: faa28d40e a7aeb6f58
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 4 11:40:01 2017 -0400

    Merge branch 'maint-0.3.1' into release-0.3.1

 changes/bug23275       | 5 +++++
 src/or/main.c          | 2 +-
 src/or/networkstatus.c | 2 +-
 3 files changed, 7 insertions(+), 2 deletions(-)