[tor-commits] [tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4

[arma at torproject.org]

commit 2998d384ec23677693b5894118d92efd0208dd5b
Merge: 9959bc5 75501db
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Jul 21 14:39:48 2014 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/geoip-july2014  |    3 +
 changes/geoip6-july2014 |    2 +
 changes/geoip6-june2014 |    2 +
 src/config/geoip        |24712 +++++++++++++++++++++++++++++++++--------------
 src/config/geoip6       | 5127 ++++------
 5 files changed, 19288 insertions(+), 10558 deletions(-)