[tor-commits] [tor/release-0.2.2] Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

[arma at torproject.org]

commit da7c60dcf310fb9914bfd1b84a34b440ab04900a
Merge: 6802499 cfeafe5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon May 30 14:49:49 2011 -0400

    Merge remote-tracking branch 'public/bug3270' into maint-0.2.2

 changes/bug3270              |    4 +++
 src/common/compat.c          |   32 +++++++++++----------
 src/common/compat.h          |   21 ++++++++++----
 src/common/compat_libevent.h |    4 +++
 src/common/util.c            |    8 +++---
 src/common/util.h            |    4 +-
 src/or/buffers.c             |    8 +++---
 src/or/buffers.h             |    4 +-
 src/or/connection.c          |   50 +++++++++++++++++----------------
 src/or/control.c             |    2 +-
 src/or/cpuworker.c           |   10 +++---
 src/or/dnsserv.c             |    2 +-
 src/or/eventdns.c            |    2 +-
 src/or/eventdns.h            |    2 +-
 src/or/main.c                |   62 +++++++++++++++++++++--------------------
 src/or/or.h                  |    2 +-
 16 files changed, 120 insertions(+), 97 deletions(-)