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

[arma at torproject.org]

commit c7473adec036031621dda7562efa019e6c95a968
Merge: 704a27b 65eb0e4
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Apr 1 10:16:57 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 Doxyfile.in                    |  295 +++++++++++++++++++++++++++++++---------
 changes/bug2683a               |    3 +
 changes/bug2696                |    5 +
 changes/bug2698                |    6 +
 changes/bug2756                |   11 ++
 changes/bug2757                |    6 +
 changes/cbt_hi_res             |    7 +
 changes/cbt_parallel_intro     |    4 +
 changes/doxygen                |    6 +
 changes/log-typo-2011-03-15-01 |    3 +
 changes/zlib_aint_openssl      |    3 +
 configure.in                   |   50 +++++--
 src/common/address.c           |    7 +-
 src/common/address.h           |   25 +++-
 src/common/aes.c               |    3 +
 src/common/compat.c            |   29 ++++-
 src/common/compat.h            |   66 ++++++++-
 src/common/compat_libevent.c   |   20 ++-
 src/common/container.c         |   19 ++-
 src/common/container.h         |    6 +-
 src/common/crypto.c            |   60 ++++++---
 src/common/log.c               |   26 +++-
 src/common/memarea.c           |    9 ++
 src/common/torgzip.c           |   10 +-
 src/common/torint.h            |    2 +-
 src/common/torlog.h            |    3 +-
 src/or/circuitbuild.c          |    6 +-
 src/or/circuitlist.c           |    8 +-
 src/or/circuituse.c            |   92 ++++++++-----
 src/or/circuituse.h            |    2 +-
 src/or/config.c                |    6 +-
 src/or/connection.c            |    4 +-
 src/or/connection_edge.c       |   17 +++
 src/or/connection_edge.h       |    1 +
 src/or/connection_or.c         |    2 +-
 src/or/directory.c             |    2 +
 src/or/geoip.c                 |   18 ++-
 src/or/main.c                  |    4 +-
 src/or/main.h                  |    6 +-
 src/or/ntmain.c                |   10 ++
 src/or/or.h                    |   31 ++++-
 src/or/relay.c                 |    9 +-
 src/or/relay.h                 |    2 +
 src/or/rendclient.c            |    2 +-
 src/or/rephist.c               |    5 +-
 src/or/routerparse.c           |    2 +-
 src/or/routerparse.h           |    4 +-
 src/test/test_crypto.c         |    6 +-
 src/test/test_dir.c            |    6 +-
 49 files changed, 722 insertions(+), 207 deletions(-)