commit 1a1e695800d373facbe736d3f386009248ad70ef Merge: bc758e4 79c875e Author: Nick Mathewson <nickm@torproject.org> Date: Mon Sep 22 10:38:05 2014 -0400 Merge remote-tracking branch 'public/bug7733a' src/or/entrynodes.c | 7 +++++++ 1 file changed, 7 insertions(+)