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

[arma at torproject.org]

commit b586709c540b162a03e7f4dd9967251c904ba58b
Merge: 688400c e035cea
Author: Roger Dingledine <arma at torproject.org>
Date:   Mon May 30 16:20:18 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug1297a             |   16 +++++
 changes/bug3045              |    6 ++
 changes/bug3216              |    4 +
 changes/bug3228              |    3 +
 changes/bug3270              |    4 +
 changes/bug3289              |    5 ++
 src/common/compat.c          |   32 +++++-----
 src/common/compat.h          |   21 +++++--
 src/common/compat_libevent.h |    3 +-
 src/common/util.c            |    8 +-
 src/common/util.h            |    4 +-
 src/or/buffers.c             |    8 +-
 src/or/buffers.h             |    4 +-
 src/or/circuitbuild.c        |   43 +++++++-----
 src/or/circuitlist.c         |    6 +-
 src/or/circuituse.c          |   15 +----
 src/or/command.c             |    4 +-
 src/or/config.c              |   26 +++++---
 src/or/connection.c          |   76 +++++++++++++---------
 src/or/connection_edge.c     |    7 +-
 src/or/control.c             |    2 +-
 src/or/cpuworker.c           |   10 ++--
 src/or/directory.c           |    9 ++-
 src/or/dirserv.c             |   45 ++++++++------
 src/or/dnsserv.c             |    2 +-
 src/or/eventdns.c            |    2 +-
 src/or/eventdns.h            |    2 +-
 src/or/main.c                |   62 +++++++++---------
 src/or/or.h                  |    7 ++-
 src/or/relay.c               |    5 +-
 src/or/rendclient.c          |   30 +++++++---
 src/or/rendservice.c         |   56 +++++++++++++----
 src/or/rephist.c             |    6 ++-
 src/or/router.c              |  143 +++++++++++++++++++++++++++++++++++++++++-
 src/or/router.h              |   22 +++++++
 src/or/routerlist.c          |   36 ++++++-----
 src/or/routerparse.c         |    5 +-
 37 files changed, 520 insertions(+), 219 deletions(-)