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

[nickm at torproject.org]

commit f0a6ea0bfd6afaa718c6b3d521a5d195d47ba56d
Merge: af33fdd7c 9ae4ffc07
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 15:55:48 2017 -0400

    Merge branch 'maint-0.3.0' into maint-0.3.1

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