[tor-commits] [tor/master] Merge remote-tracking branch 'asn/bug17688'

[nickm at torproject.org]

commit c274f825da18f33f12eb78260d1c78d5f685d959
Merge: 9eeaedd 36dd953
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Jun 11 10:07:15 2016 -0400

    Merge remote-tracking branch 'asn/bug17688'

 changes/bug17688    |  3 +++
 src/or/entrynodes.c | 11 ++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)