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

[nickm at torproject.org]

commit 55492e7d5a1dae4b2be49daed4abdafabf4366b7
Merge: 85169a1 bcc0a48
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Apr 27 14:08:46 2015 -0400

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

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