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

[nickm at torproject.org]

commit 2a02efb601e287722159c6754a1b20085faebd93
Merge: 331e4dc ef4db31
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 11 13:32:35 2013 -0400

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

 changes/geoip-mar2013 |    3 +
 src/config/geoip      |92875 +++++++++++++++++++++++++++++++++++++++++++++----
 2 files changed, 85446 insertions(+), 7432 deletions(-)