commit 16c7b05ac6238697128306b5b72cdc3155d51b4e Merge: 5540434 073fed0 Author: Roger Dingledine arma@torproject.org Date: Tue May 17 21:15:33 2011 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug3200 | 6 ++++++ src/or/config.c | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-)