commit b1bd1bf19f7e17a94cefaccb63e5608fda1df4e2 Merge: fcd5c3144 5bca66be4 Author: Nick Mathewson nickm@torproject.org Date: Mon Oct 23 15:53:45 2017 -0400

Merge remote-tracking branch 'teor/bug23874-029' into maint-0.2.9

changes/bug23874 | 3 +++ src/or/nodelist.c | 8 ++++++++ 2 files changed, 11 insertions(+)