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

[arma at torproject.org]

commit 984a6bfeb8f80ed347087f321fcbe98677dcd60c
Merge: d6b5caa 0f48e8f
Author: Roger Dingledine <arma at torproject.org>
Date:   Wed Apr 27 14:06:19 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug1090-general        |   73 ++++++++++++++++
 changes/bug1090-launch-warning |    5 +
 changes/bug2704                |    5 +
 changes/bug2899                |    4 +
 changes/bug2917                |    4 +
 changes/bug2971                |    6 ++
 changes/bug2979                |    9 ++
 changes/exitnodes_reliable     |    7 ++
 doc/tor.1.txt                  |   76 +++++++++++++----
 src/or/circuitbuild.c          |  183 +++++++++++++++++++++++-----------------
 src/or/circuitlist.c           |   70 +++++++++++++++
 src/or/circuitlist.h           |    1 +
 src/or/circuituse.c            |   76 +++++++++++------
 src/or/circuituse.h            |    2 +
 src/or/config.c                |   83 ++++--------------
 src/or/connection_edge.c       |  117 ++++++++++++++++++++------
 src/or/connection_edge.h       |    4 +-
 src/or/control.c               |    4 +-
 src/or/directory.c             |   31 +++++++-
 src/or/dirserv.h               |    2 +-
 src/or/dnsserv.c               |    2 +-
 src/or/eventdns.c              |    4 +-
 src/or/eventdns.h              |    4 +-
 src/or/main.c                  |   49 ++---------
 src/or/main.h                  |    2 +-
 src/or/or.h                    |   13 ++-
 src/or/rendclient.c            |   87 ++++++++++++++++---
 src/or/rendclient.h            |    1 +
 src/or/rendcommon.c            |    2 +-
 src/or/rendservice.c           |   40 +++++++--
 src/or/rephist.c               |   49 ++++++-----
 src/or/router.c                |   20 +++++
 src/or/routerlist.c            |   73 ++++++++++++++---
 src/or/routerlist.h            |    4 +
 34 files changed, 785 insertions(+), 327 deletions(-)