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

[nickm at torproject.org]

commit e3adeb6200df77c7dc34ba06092715d9551f8faa
Merge: 13f1d2f d79d648
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Aug 17 15:51:29 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2' into release-0.2.2

 changes/bug3577          |    4 +
 changes/bug3607          |   15 +
 changes/bug3643          |    4 +
 changes/bug3732          |    7 +
 changes/bug3747          |    6 +
 changes/fmt_addr         |    4 +
 changes/geoip-august2011 |    3 +
 configure.in             |    9 +
 doc/HACKING              |    6 +-
 src/common/address.c     |    6 +-
 src/config/geoip         | 6191 ++++++++++++++++++++++++----------------------
 src/or/config.c          |    3 +
 src/or/connection.c      |    3 -
 src/or/control.c         |   12 +-
 src/or/geoip.c           |    4 +-
 src/or/rendservice.c     |    6 +-
 src/or/rephist.c         |    2 +-
 src/tools/tor-gencert.c  |    4 +-
 18 files changed, 3311 insertions(+), 2978 deletions(-)