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

[nickm at torproject.org]

commit 173a1afc5819f1fcabfa34bab5714d61088cc29f
Merge: 55c7a55 f5ce580
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 10 21:09:27 2014 -0400

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

 changes/geoip6-june2014 |    2 +
 src/config/geoip        |22394 ++++++++++++++++++++++++++++++++---------------
 src/config/geoip6       | 2115 +++--
 3 files changed, 16821 insertions(+), 7690 deletions(-)