[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[arma at torproject.org]

commit 4d8306e0e92200e1a25a073480ec342e22e590b7
Merge: 9725646 be6928d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Nov 7 10:42:34 2011 -0500

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

 changes/bug4410      |    5 +++++
 src/or/routerparse.c |    5 +++++
 2 files changed, 10 insertions(+), 0 deletions(-)