commit 7649adbce60c7ab615e233f9e9ce41c22df8134c Merge: 6d5478a 8057b73 Author: Nick Mathewson nickm@torproject.org Date: Wed May 11 22:55:29 2011 -0400

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

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