commit 7de3a19497f081e680e7fd35315f107510f313ad Merge: 4c9bd06 ab1460f Author: Nick Mathewson nickm@torproject.org Date: Wed May 4 20:33:38 2011 -0400

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

src/or/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)