commit 4ed142ae9bb42f741b3626f83f89bc3a39af6a33 Merge: 92944a6 5298ab5 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Mar 1 15:04:15 2017 -0500 Merge branch 'maint-0.3.0' into release-0.3.0 src/or/entrynodes.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)