[or-cvs] [tor/master] Merge branch 'bug2409' into maint-0.2.2

[nickm at torproject.org]

commit ba3b03def05796619620346e02b127ad9436333e
Merge: 1478aa9 71862ed
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 26 11:06:59 2011 -0500

    Merge branch 'bug2409' into maint-0.2.2

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