commit ebedb5e06f68b102711477997c3e04ccece0e12d Merge: 602f9565a f0a6ea0bf Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 23 15:55:48 2017 -0400 Merge branch 'maint-0.3.1' into release-0.3.1 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)