commit bd7724a57eeb756232f5be222c643ccb8b364966 Merge: a0d1e80 f6afd4e Author: Nick Mathewson nickm@torproject.org Date: Thu Apr 19 17:08:09 2012 -0400

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

changes/bug5647 | 4 ++++ src/or/routerparse.c | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-)