[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug24555'

[nickm at torproject.org]

commit d6374681281c64156bf282bdb65ddd9ac7c881e7
Merge: 942fa0c4a 40cd992ab
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jan 8 10:45:40 2018 -0500

    Merge remote-tracking branch 'arma/bug24555'

 src/or/routerlist.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)