commit 139799cdceadafd8dbbc54fb73bfa91179489b58
Merge: 68a2c75 41fe94e
Author: Nick Mathewson <nickm(a)torproject.org>
Date: Thu Jul 6 09:29:03 2017 -0400
Merge branch 'bug20488_029_squashed'
changes/ticket20488 | 5 +++++
src/or/nodelist.c | 8 +++-----
2 files changed, 8 insertions(+), 5 deletions(-)