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

[nickm at torproject.org]

commit 3892e03cfc1a17a8a82a931bdd62c5649752ee45
Merge: 147a0f3 ace95c5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Sep 16 12:48:45 2013 -0400

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

 changes/geoip-september2013 |    3 +
 src/config/geoip            |12806 ++++++++++++++++++++++---------------------
 2 files changed, 6556 insertions(+), 6253 deletions(-)