commit 177cadff8d4ca01aad21abea44c7ecc0731525d6 Merge: 0e554f9 48bdc2f Author: Nick Mathewson nickm@torproject.org Date: Tue Apr 19 12:36:49 2011 -0400

Merge remote-tracking branch 'rransom/bug2948' into maint-0.2.2

changes/bug2948 | 7 +++++++ src/or/routerparse.c | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-)