commit d8604b8729b24f964d78d188b89493098d3eb92b Merge: e00f12ec6 eaf9c0f25 Author: Nick Mathewson nickm@torproject.org Date: Sun Oct 15 20:36:23 2017 -0400

Merge branch 'teor_bug23813_squashed'

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