[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 609cdec112bfbe37947a58f2fe2790ee3a2660eb
Merge: 542100d bcc0a48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 27 14:15:44 2015 -0400

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

 changes/geoip-april2015 |    3 +
 src/config/geoip        |10061 ++++++++++++++++-------------------------------
 2 files changed, 3452 insertions(+), 6612 deletions(-)