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

[nickm at torproject.org]

commit 909f18910efddc107a3602529c7029b40bf0aeed
Merge: fce6eb1 d48cebc
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Aug 3 13:33:36 2012 -0400

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

 changes/bug6530              |    5 +++++
 changes/geoip-june2012       |    3 +++
 changes/pathsel-BUGGY-a      |   14 ++++++++++++++
 changes/revert-geoip-may2012 |    6 ++++++
 src/or/routerlist.c          |   22 ++++++++++++++++++----
 src/or/routerparse.c         |    2 +-
 6 files changed, 47 insertions(+), 5 deletions(-)