[tor-commits] [tor/maint-0.3.1] Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1

[nickm at torproject.org]

commit a7aeb6f58f24e30c329874204a5f0db4b65bb2f0
Merge: 6307a759e 86ee35ad5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 4 11:39:28 2017 -0400

    Merge remote-tracking branch 'public/bug23275_031' into maint-0.3.1

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