commit cec58ae55c4625878213e8794e3784cd16e2af67 Merge: 3deb01e1a a58b19465 Author: Nick Mathewson nickm@torproject.org Date: Wed Nov 14 07:56:52 2018 -0500

Merge branch 'maint-0.3.5'

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