commit 83a859e24ced67663ea46f3bd05d53b29f6797c0 Merge: 5405688 0a0f93d Author: Nick Mathewson nickm@torproject.org Date: Wed Jul 31 21:49:30 2013 -0400

Merge remote-tracking branch 'origin/maint-0.2.4'

changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- 5 files changed, 25 insertions(+), 8 deletions(-)