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

[nickm at torproject.org]

commit 64293135df7611b7caa939eee57a8f0b9d29e617
Merge: f96a8d5 7ef2939
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 11 11:17:18 2013 -0400

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

 changes/geoip-october2013 |    3 +
 src/config/geoip          | 2019 ++++++++++++++++++++++++++++-----------------
 2 files changed, 1245 insertions(+), 777 deletions(-)