commit 990a863d7ca74c84238791607b6515813b3b5633 Merge: 988b0af 506bd6d Author: Nick Mathewson nickm@torproject.org Date: Fri Dec 16 11:40:19 2016 -0500

Merge branch 'ticket20831_v2'

changes/ticket20831 | 6 +++ doc/tor.1.txt | 9 ----- src/or/config.c | 2 +- src/or/directory.c | 5 +-- src/or/entrynodes.c | 91 ++++++++++++++++++++++++++++++++++++++-------- src/or/entrynodes.h | 23 +++++++++++- src/or/or.h | 2 - src/test/test_dir.c | 14 ++----- src/test/test_entrynodes.c | 70 +++++++++++++++++++++-------------- 9 files changed, 152 insertions(+), 70 deletions(-)