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

[nickm at torproject.org]

commit 5d706dd27a9d439175051ab5977e0474d669fde2
Merge: 4361795 3433b7c
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Aug 12 09:47:17 2013 -0400

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

 changes/geoip-august2013 |    3 +
 src/config/geoip         | 9207 +++++++++++++++++++++++-----------------------
 2 files changed, 4521 insertions(+), 4689 deletions(-)