commit 0b795ce6de339ccdabe17cb78f632df6f74901e2 Merge: 5e7d50585 0c13a84c0 Author: Nick Mathewson nickm@torproject.org Date: Tue Mar 27 18:24:59 2018 -0400

Merge remote-tracking branch 'catalyst-github/bug25629-032' into maint-0.3.2

changes/bug25629 | 3 +++ src/or/nodelist.c | 28 ++++++++++++++-------------- 2 files changed, 17 insertions(+), 14 deletions(-)