commit 18f1b354ece34947e9a17b5cefb33cfbd73641e7 Merge: 92081f3 073fed0 Author: Roger Dingledine arma@torproject.org Date: Tue May 17 21:15:24 2011 -0400

Merge branch 'maint-0.2.2'

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