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

[arma at torproject.org]

commit ab774a8500a6f4302296ff4c6ea23ba5c64eaa52
Merge: 8d9602c 555c43c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 10 21:07:57 2014 -0400

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

 src/config/geoip |22394 +++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 15384 insertions(+), 7010 deletions(-)