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

[arma at torproject.org]

commit d6d9df241cfd6bb4af18b57b45f725e2c6c79fb5
Merge: 66732b7 7aa20b2
Author: Roger Dingledine <arma at torproject.org>
Date:   Fri Jun 3 15:25:54 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug2355        |    8 ++++++++
 changes/bug2748        |   10 ++++++++++
 changes/bug3309        |   13 +++++++++++++
 changes/bug3318        |    7 +++++++
 changes/bug3321        |    7 +++++++
 doc/tor.1.txt          |   10 +++++++---
 src/common/crypto.c    |   11 +++++++++++
 src/common/crypto.h    |    1 +
 src/common/procmon.c   |    8 ++++----
 src/or/circuitbuild.c  |   17 ++++++++++++-----
 src/or/config.c        |   42 ++++++++++++++++++++++++++----------------
 src/or/connection.c    |    4 ++--
 src/or/dirserv.c       |    5 +++--
 src/or/main.c          |    3 +--
 src/or/or.h            |   12 +++++++++++-
 src/or/rendclient.c    |   46 +++++++++++++++++++++++++++++++++++++++++++---
 src/or/rendclient.h    |    3 +++
 src/or/rendcommon.c    |   17 +++++++----------
 src/or/router.c        |   18 +++++++++++-------
 src/or/router.h        |    3 ++-
 src/or/routerparse.c   |    4 ++--
 src/test/test_crypto.c |    2 ++
 22 files changed, 193 insertions(+), 58 deletions(-)