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

[nickm at torproject.org]

commit 1040afb2425a8056dc41b35e6d825fc329663ee6
Merge: 122c8ef 55f6357
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 11:18:40 2012 -0400

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

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