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

[arma at torproject.org]

commit 1e1cc43b5723008dc6ec19188b1613c3682c36d3
Merge: 3869661 d679ef6
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon Sep 12 05:54:55 2011 -0400

    Merge branch 'maint-0.2.2'

 changes/geoip-september2011 |    3 +
 src/config/geoip            | 5974 ++++++++++++++++++++++++++++++-------------
 2 files changed, 4137 insertions(+), 1840 deletions(-)