commit 9ae4ffc0763fcb0a50d0d02be7d3362cc496adc1 Merge: eac4c374e b1bd1bf19 Author: Nick Mathewson <nickm@torproject.org> Date: Mon Oct 23 15:55:08 2017 -0400 Merge branch 'maint-0.2.9' into maint-0.3.0 changes/bug23874 | 3 +++ src/or/nodelist.c | 5 +++++ 2 files changed, 8 insertions(+)