commit 8057b7363ecb3fdc6dcd41d8f975bb50ef1bf6ea Merge: 7206d78 d1c7f65 Author: Nick Mathewson nickm@torproject.org Date: Wed May 11 22:52:26 2011 -0400

Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

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