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

[nickm at torproject.org]

commit b1ab360eca6a1ebd82762d7a735848c25cf19db1
Merge: 9068e55ce da82e0b57
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 20 14:35:26 2017 -0500

    Merge branch 'maint-0.3.2'

 src/or/entrynodes.c | 30 ++++++++++++++----------------
 src/or/entrynodes.h |  2 +-
 2 files changed, 15 insertions(+), 17 deletions(-)