commit 15ac8c5711fdbf5f1327368be20e62776ccda45f Merge: b8e5822 439fc70 Author: Nick Mathewson nickm@torproject.org Date: Wed Apr 4 21:05:42 2012 -0400

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

changes/ides-becomes-turtles | 4 ++++ src/or/config.c | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-)