[or-cvs] [tor/release-0.2.1] Merge branch 'maint-0.2.1' into release-0.2.1

[arma at torproject.org]

commit 73a7028a11bf1d20594e96ff677a82dc86ffdd76
Merge: 3936267 ef6fa07
Author: Roger Dingledine <arma at torproject.org>
Date:   Sat Jan 15 14:45:07 2011 -0500

    Merge branch 'maint-0.2.1' into release-0.2.1

 LICENSE                    |    2 +-
 Makefile.am                |    4 +-
 changes/bug2190            |    6 +
 changes/bug2305            |    5 +
 changes/bug2313            |    4 +
 changes/bug2324            |    4 +
 changes/bug2324_uncompress |    5 +
 changes/bug2326            |    6 +
 changes/bug2328            |    9 +
 changes/bug2332            |    4 +
 changes/bug2352            |    6 +
 changes/bug2384            |    6 +
 changes/geoip-jan2011      |    3 +
 changes/tolen_asserts      |    8 +
 contrib/bundle.nsi         |    2 +-
 contrib/netinst.nsi        |    2 +-
 contrib/polipo/README      |    4 +-
 src/common/address.c       |    2 +-
 src/common/address.h       |    2 +-
 src/common/aes.c           |    2 +-
 src/common/aes.h           |    2 +-
 src/common/compat.c        |    2 +-
 src/common/compat.h        |    4 +-
 src/common/container.c     |    2 +-
 src/common/container.h     |    2 +-
 src/common/crypto.c        |   81 +-
 src/common/crypto.h        |   16 +-
 src/common/ht.h            |    2 +-
 src/common/log.c           |   16 +-
 src/common/log.h           |    6 +-
 src/common/memarea.c       |    2 +-
 src/common/memarea.h       |    2 +-
 src/common/mempool.c       |    2 +-
 src/common/mempool.h       |    2 +-
 src/common/test.h          |    2 +-
 src/common/torgzip.c       |   62 +-
 src/common/torgzip.h       |    2 +-
 src/common/torint.h        |    4 +-
 src/common/tortls.c        |    2 +-
 src/common/tortls.h        |    2 +-
 src/common/util.c          |    6 +-
 src/common/util.h          |    2 +-
 src/config/geoip           | 5317 +++++++++++++++++++++++++++++---------------
 src/or/buffers.c           |    2 +-
 src/or/circuitbuild.c      |    7 +-
 src/or/circuitlist.c       |    2 +-
 src/or/circuituse.c        |    2 +-
 src/or/command.c           |    5 +-
 src/or/config.c            |    7 +-
 src/or/connection.c        |    2 +-
 src/or/connection_edge.c   |   55 +-
 src/or/connection_or.c     |    2 +-
 src/or/control.c           |    2 +-
 src/or/cpuworker.c         |    2 +-
 src/or/directory.c         |    2 +-
 src/or/dirserv.c           |    2 +-
 src/or/dirvote.c           |    2 +-
 src/or/dns.c               |    2 +-
 src/or/dnsserv.c           |    5 +-
 src/or/eventdns_tor.h      |    2 +-
 src/or/geoip.c             |    2 +-
 src/or/hibernate.c         |    2 +-
 src/or/main.c              |    2 +-
 src/or/networkstatus.c     |    3 +-
 src/or/ntmain.c            |    2 +-
 src/or/onion.c             |    8 +-
 src/or/or.h                |    2 +-
 src/or/policies.c          |    2 +-
 src/or/reasons.c           |    2 +-
 src/or/relay.c             |    2 +-
 src/or/rendclient.c        |    5 +-
 src/or/rendcommon.c        |    6 +-
 src/or/rendmid.c           |    8 +-
 src/or/rendservice.c       |   10 +-
 src/or/rephist.c           |    2 +-
 src/or/router.c            |    2 +-
 src/or/routerlist.c        |    5 +-
 src/or/routerparse.c       |   35 +-
 src/or/test.c              |   45 +-
 src/or/test_data.c         |    2 +-
 src/or/tor_main.c          |    2 +-
 src/tools/tor-gencert.c    |    2 +-
 src/tools/tor-resolve.c    |    2 +-
 83 files changed, 3914 insertions(+), 1968 deletions(-)