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

[nickm at torproject.org]

commit 244ca67e47238ae8f687c4d4038b7f696824b023
Merge: 691371b b98e3f9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 13 12:51:27 2014 -0400

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

 changes/geoip-august2014 |    3 +
 src/config/geoip         | 5217 ++++++++++++++++++++++++++++++++++------------
 2 files changed, 3830 insertions(+), 1390 deletions(-)