[tor-commits] [tor/master] Merge branch 'maint-0.2.2'

[arma at torproject.org]

commit 068046eebc73fbe1f0d8419f0dfea65d3de9c14a
Merge: 7516b4a 229abbf
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Jun 13 03:48:43 2012 -0400

    Merge branch 'maint-0.2.2'

 changes/geoip-june2012 |    3 +
 src/config/geoip       |35480 ++++++++++++++++++------------------------------
 2 files changed, 13355 insertions(+), 22128 deletions(-)