commit 677384e276a68993e3f48b949ef47f3a5cf1e324 Merge: 1cffacdaf 1547fd99a Author: Nick Mathewson <nickm@torproject.org> Date: Fri Mar 15 08:59:30 2019 -0400 Merge branch 'maint-0.4.0' changes/bug28656 | 3 +++ src/feature/nodelist/nodelist.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)