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

[nickm at torproject.org]

commit 5465ac5ea3888fb86bd09d81f6f2ab5a8d7c9baf
Merge: ed8374e b395b59
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Apr 11 09:26:37 2012 -0400

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

 changes/geoip-april2012 |    3 +
 src/config/geoip        | 9553 +++++++++++++++++++++++++++++++----------------
 2 files changed, 6373 insertions(+), 3183 deletions(-)