[tor-commits] [tor/master] Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1

[nickm at torproject.org]

commit dfc9c6a0f9c0488e437dfbf1181041ca0e194f1d
Merge: cfd7b11 adc3100
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Apr 19 12:30:50 2011 -0400

    Merge remote-tracking branch 'rransom/bug2750-v3' into maint-0.2.1

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