commit 3dfd1ebf12671323e97b002f66484544d90f1bae Merge: 8e7226c 7f50af1 Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 11 01:40:31 2013 -0400

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

changes/bug8117 | 13 +++++++++++++ doc/tor.1.txt | 9 +++++++++ src/or/buffers.c | 17 ++++++++++------- src/or/config.c | 7 +++++++ src/or/connection.c | 6 ++++++ src/or/or.h | 12 ++++++++++++ 6 files changed, 57 insertions(+), 7 deletions(-)