[tor-commits] [tor/master] Merge remote-tracking branch 'fristonio/ticket-24740'

[nickm at torproject.org]

commit e263317e07e61e7adbb3515b46a978997a9d20c0
Merge: 11114c7e8 930b98558
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 23 11:22:58 2018 -0400

    Merge remote-tracking branch 'fristonio/ticket-24740'

 changes/ticket24740    |  5 +++++
 src/or/networkstatus.c | 17 ++++++++++++-----
 2 files changed, 17 insertions(+), 5 deletions(-)