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

[arma at torproject.org]

commit 2a8e9aa8e391c049a72a00e233a8bc9e49a64701
Merge: fac45b4 6426cd1
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Mar 8 18:16:46 2011 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug2250       |    5 +
 changes/geoip-mar2011 |    3 +
 src/config/geoip      | 7639 ++++++++++++++++++++++++++++---------------------
 src/or/config.c       |   13 +-
 src/or/or.h           |    5 +
 5 files changed, 4438 insertions(+), 3227 deletions(-)