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

[arma at torproject.org]

commit 34c70ba9e62cc28c3bfe363c1c34a2f0fbf2dba4
Merge: 2d4aeba c860a96
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Jun 8 15:12:29 2013 -0400

    Merge branch 'maint-0.2.4' into release-0.2.4

 changes/geoip-june2013 |    3 +
 doc/tor.1.txt          |    4 +-
 src/config/geoip       |106050 +++++-------------------------------------------
 3 files changed, 9170 insertions(+), 96887 deletions(-)