commit df9d2de44119e09e8fc485c6ff57ca01c226abd1 Merge: 338dbdab9 1c8f55310 Author: Nick Mathewson nickm@torproject.org Date: Sat Mar 3 12:02:30 2018 -0500

Merge remote-tracking branch 'fristonio/ticket4187'

changes/ticket4187 | 3 +++ src/or/networkstatus.c | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-)