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

[nickm at torproject.org]

commit b1d6cf2508e57c98017412446024c9dd6587fe63
Merge: 8b8d50104 f0a6ea0bf
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 15:55:48 2017 -0400

    Merge branch 'maint-0.3.1' into maint-0.3.2

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