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

[nickm at torproject.org]

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

    Merge branch 'maint-0.3.2'

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