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

[nickm at torproject.org]

commit e2e13e7c8a2a40074805a19651d7837484d3a8b8
Merge: 209bfe715 a7aeb6f58
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 4 11:40:02 2017 -0400

    Merge branch 'maint-0.3.1'

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