commit d8fa6f9ddb74ced0b51a39608526eba0fc21135a Merge: fa6b426 18a9820 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 1 08:54:58 2017 -0500 Merge branch 'maint-0.3.0' changes/bug21415 | 4 ++++ src/or/entrynodes.c | 12 +++++++++--- 2 files changed, 13 insertions(+), 3 deletions(-)