commit a4ed8622c01fc1f2f93a44d4b3e0857b6da94620 Merge: 9d1ea45 4a351b4 Author: Roger Dingledine arma@torproject.org Date: Tue Sep 13 18:34:12 2011 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug4014 | 3 +++ src/or/main.c | 7 ++++--- src/or/or.h | 4 +++- src/or/router.c | 4 ++-- 4 files changed, 12 insertions(+), 6 deletions(-)