commit d1c7f65a8e76b594c63bf23baf7fb6c19ba44c00 Merge: e7b10e5 13847b8 Author: Nick Mathewson nickm@torproject.org Date: Wed May 11 22:49:44 2011 -0400

Merge branch 'bug3135' into maint-0.2.1

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