[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit e0e8424f1eaf88f1c03a0acbfe09d368d3cbb1be
Merge: 4082d67 21ed575
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue May 17 19:47:48 2011 -0400

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

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