commit e23084bc6a9343013988d7c14c7a70b8244825ce Merge: 1bf534c bdd267e Author: Nick Mathewson <nickm@torproject.org> Date: Thu Jun 22 10:56:08 2017 -0400 Merge branch 'maint-0.3.0' into release-0.3.0 changes/bug22400_01 | 4 ++++ src/or/entrynodes.c | 36 +++++++++++++++++++++++++----------- 2 files changed, 29 insertions(+), 11 deletions(-)