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

[arma at torproject.org]

commit 9fdfc10092da66b342dc06a590e0ca1d348b55be
Merge: 5ad0de1 0582746
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Dec 8 17:23:58 2011 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug4529            |    5 +
 changes/bug4530            |    6 +
 changes/bug4531            |    4 +
 changes/bug4535            |    3 +
 changes/geoip-december2011 |    3 +
 src/common/address.c       |    9 +-
 src/common/compat.c        |    2 +-
 src/common/compat.h        |    2 +-
 src/config/geoip           |10429 ++++++++++++++++++++++++++++----------------
 src/or/connection_or.c     |    4 +-
 10 files changed, 6688 insertions(+), 3779 deletions(-)