commit 52c4440c4895cb90dd155bb094b49a97128baedf Merge: 4c21d4e 88666d0 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 29 15:57:42 2017 -0400

Merge branch 'trove-2017-006' into maint-0.3.0

changes/bug22753 | 7 +++++++ src/or/entrynodes.c | 39 ++++++++++++++++++++++++++++++++++++++- src/or/entrynodes.h | 9 +++++---- src/or/nodelist.c | 2 +- src/or/nodelist.h | 2 ++ src/test/test_entrynodes.c | 19 +++++++++++++++++-- 6 files changed, 70 insertions(+), 8 deletions(-)