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

[nickm at torproject.org]

commit 7159e19ea90b16d35beefd09ff84bf69b71d23ee
Merge: beec881 c860a96
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jun 5 11:22:36 2013 -0400

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

 changes/geoip-june2013 |    3 +
 src/config/geoip       |106050 +++++-------------------------------------------
 2 files changed, 9168 insertions(+), 96885 deletions(-)