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

[nickm at torproject.org]

commit c64b549621c8354efa3c58760f63a59660dcb974
Merge: 339a47e bc58bfd
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Feb 15 00:07:15 2014 -0500

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

 changes/geoip-february2014  |    3 +
 changes/geoip6-february2014 |    3 +
 src/config/geoip            |17809 +++++++++++++++++++++++--------------------
 src/config/geoip6           | 7834 ++++++++++++++++---
 4 files changed, 16432 insertions(+), 9217 deletions(-)