[tor-commits] [tor/release-0.2.9] Merge branch 'maint-0.2.9' into release-0.2.9

[nickm at torproject.org]

commit 4dad6123cf7bd9f52225dc89eb0c2e3ae28da7b2
Merge: df4eba5c2 b1bd1bf19
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 15:53:50 2017 -0400

    Merge branch 'maint-0.2.9' into release-0.2.9

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