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

[nickm at torproject.org]

commit da82e0b5795c449f4442c87e065e9a60da4892a8
Merge: e2d8300c1 69f93f806
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 20 14:29:50 2017 -0500

    Merge branch 'bug23817_031' into maint-0.3.2

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