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

[nickm at torproject.org]

commit 015f710f72823bc31c3075fb41d3ae33eb7abe06
Merge: f5ce580 6d5efbe
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jul 21 14:29:30 2014 -0400

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

 changes/geoip-july2014 |    3 +
 src/config/geoip       | 3600 +++++++++++++++++++++++++++++++++---------------
 2 files changed, 2499 insertions(+), 1104 deletions(-)