[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'

[nickm at torproject.org]

commit 4ac8ff9c9f182b6202200480f8fc4689da659331
Merge: f2c1702 ede102f
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun May 15 20:22:44 2011 -0400

    Merge remote-tracking branch 'origin/maint-0.2.2'

 changes/bug2792_checkdir |    8 ++++++
 changes/bug2972          |    5 ++++
 doc/tor.1.txt            |    5 ++++
 src/common/compat.c      |   39 +++++++++++++++++++++++++++++++
 src/common/compat.h      |    2 +
 src/common/util.c        |   58 ++++++++++++++++++++++++++++++++++++++--------
 src/common/util.h        |    7 ++++-
 src/or/config.c          |   13 ++++++++--
 src/or/connection.c      |   49 ++++++++++++++++++++++++++++++++++++++
 src/or/or.h              |    1 +
 src/test/test_util.c     |   30 +++++++++++++++++++++++
 11 files changed, 203 insertions(+), 14 deletions(-)