commit 1712dc98b04ef7b84df67e02da21ea1aa70bc74c Merge: 31a08ba 52c4440 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 29 15:57:48 2017 -0400

Merge branch 'maint-0.3.0' into maint-0.3.1

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(-)