[tor-commits] [tor/master] Merge branch 'ticket27247'

[nickm at torproject.org]

commit b67f3b751a277fb940b155c0bc64f594db5549b0
Merge: 88c973081 33a0c619a
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Sep 14 09:14:12 2018 -0400

    Merge branch 'ticket27247'

 changes/ticket27247                  |  5 +++++
 src/feature/control/control.c        |  4 +---
 src/feature/nodelist/networkstatus.c | 11 ++++++-----
 3 files changed, 12 insertions(+), 8 deletions(-)