commit 9e8671bb9adffcb5893cae7ea03e06179e073d4c Merge: fae4d3d 33dcd0c Author: Nick Mathewson nickm@torproject.org Date: Tue Jan 24 09:20:49 2017 -0500

Merge branch 'bug20824_v4'

changes/bug20824 | 3 +++ src/or/control.c | 13 ++++++++----- src/or/entrynodes.c | 36 ++++++++++++++++++++++++++++++++++++ src/or/entrynodes.h | 6 +++++- src/test/test_entrynodes.c | 30 ++++++++++++++++++++++++++++++ 5 files changed, 82 insertions(+), 6 deletions(-)