[tor-commits] [tor/master] Merge branch 'maint-0.3.2'

[nickm at torproject.org]

commit f7707c9031381cf3ceb663d3bc3a9c81e346a90d
Merge: 880d596f4 b1d6cf250
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Oct 23 15:55:48 2017 -0400

    Merge branch 'maint-0.3.2'

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