commit 1547fd99a68cb22410ed0842267fb0a1f1de925f Merge: 560ba98dd 532f4c910 Author: Nick Mathewson nickm@torproject.org Date: Fri Mar 15 08:59:19 2019 -0400

Merge branch 'bug28656_035_squashed' into maint-0.4.0

changes/bug28656 | 3 +++ src/feature/nodelist/nodelist.c | 16 +++++++++++----- 2 files changed, 14 insertions(+), 5 deletions(-)