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

[arma at torproject.org]

commit 7cc2b9dc83c375bf25e8e093fd9d72e5b46e63df
Merge: 66f8478 8e5dfe4
Author: Roger Dingledine <arma at torproject.org>
Date:   Sun Jun 19 21:03:44 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/abandon-rend-circs-on-newnym |    8 +
 changes/bug2355_revert               |    7 +
 changes/bug3306                      |    9 +
 changes/bug3369                      |    4 +
 changes/bug3393                      |    5 +
 changes/coverity_maint               |    9 +
 changes/fix-connection_printf_to_buf |   15 +
 changes/geoip-june2011               |    3 +
 doc/tor.1.txt                        |   10 +-
 src/common/crypto.c                  |    5 +-
 src/common/util.c                    |   33 +-
 src/common/util.h                    |    3 +-
 src/config/geoip                     | 5398 ++++++++++++++++++++++++----------
 src/or/circuitbuild.c                |   10 +-
 src/or/circuitlist.c                 |    4 +-
 src/or/circuituse.c                  |    3 +-
 src/or/config.c                      |   25 +-
 src/or/connection.c                  |    2 +-
 src/or/connection_or.c               |    5 +-
 src/or/control.c                     |   66 +-
 src/or/dnsserv.c                     |    4 +-
 src/or/geoip.c                       |    6 +-
 src/or/or.h                          |   12 +-
 src/or/policies.c                    |    2 +-
 src/or/rendservice.c                 |    2 +-
 src/or/rephist.c                     |   13 +-
 src/or/router.c                      |    4 +-
 src/or/routerparse.c                 |    6 +-
 src/test/test_addr.c                 |    3 +
 29 files changed, 3951 insertions(+), 1725 deletions(-)