commit a58b19465d9ffada3df87ea9be769d1f27c414cc Merge: eba989bf0 16ca6fdfd Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 14 07:56:48 2018 -0500

Merge remote-tracking branch 'teor/bug28441-035' into maint-0.3.5

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