commit 0235fe34d2c915f46933ead253192b042c713af0 Merge: a2851d3 3ff7925 Author: Roger Dingledine arma@torproject.org Date: Sat May 21 16:09:55 2011 -0400

Merge branch 'bug1810' into maint-0.2.2

changes/bug1810 | 6 ++++++ src/or/config.c | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-)