commit 27fbfbbe7cc18477f828bd121e046c5547fb1000 Merge: f473dec 0a0f93d Author: Roger Dingledine arma@torproject.org Date: Mon Aug 5 02:49:40 2013 -0400

Merge branch 'maint-0.2.4' into release-0.2.4

changes/bug9288 | 4 ++++ changes/bug9354 | 5 +++++ doc/tor.1.txt | 6 ++++-- src/or/config.c | 2 +- src/or/entrynodes.c | 17 +++++++++++++---- src/or/or.h | 3 ++- src/or/transports.c | 24 +++++++++++++++--------- 7 files changed, 44 insertions(+), 17 deletions(-)