[tor-commits] [tor/master] Merge branch 'maint-0.2.4'

commit 331e4dcb460b5c91c1760af134f1a1c1f36b871b Merge: aa3126b 0196647 Author: Roger Dingledine arma@torproject.org Date: Sun Mar 10 23:42:14 2013 -0400

Merge branch 'maint-0.2.4'

changes/ticket8443 | 4 ++++ doc/tor.1.txt | 9 +++++++-- src/common/tortls.c | 16 +++++++++++----- src/or/config.c | 1 + src/or/or.h | 6 ++++-- src/or/router.c | 21 +++++++++++++++++++-- 6 files changed, 46 insertions(+), 11 deletions(-)