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

[nickm at torproject.org]

commit 3d966f57a4452b72696525084453191910f5ec0e
Merge: 668809192 038628048
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Nov 2 10:34:08 2017 -0400

    Merge branch 'maint-0.3.2' into release-0.3.2

 changes/bug24025  | 5 +++++
 src/or/nodelist.c | 5 ++++-
 2 files changed, 9 insertions(+), 1 deletion(-)