commit 9e44df2c98208fc6d0c3e9f9b3834f54e8a37cd8 Merge: 3fc0f9e db72479 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 23 11:01:39 2014 -0400

Merge remote-tracking branch 'public/bug9229_024' into maint-0.2.4

changes/bug9229 | 5 +++++ src/or/entrynodes.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletion(-)