commit 08843175f6966249935d05b767524e0916a0a3e9 Merge: 2bdf810 1f18b5a Author: Roger Dingledine arma@torproject.org Date: Sun May 29 15:27:44 2011 -0400

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug2574 | 3 + changes/bug3208 | 6 + changes/exit-policy-default-is-not-a-prefix | 5 + changes/feature3049 | 6 + src/common/Makefile.am | 4 +- src/common/compat.h | 2 +- src/common/compat_libevent.c | 2 +- src/common/log.c | 2 +- src/common/procmon.c | 336 +++++++++++++++++++++++++++ src/common/procmon.h | 30 +++ src/common/torlog.h | 1 - src/common/util.c | 18 +- src/or/circuitbuild.c | 3 - src/or/command.c | 1 + src/or/config.c | 15 ++ src/or/connection.c | 3 +- src/or/control.c | 140 +++++++++++- src/or/control.h | 4 + src/or/directory.c | 2 - src/or/dirvote.c | 3 +- src/or/eventdns.c | 5 +- src/or/or.h | 10 +- src/or/router.c | 7 +- src/test/test_crypto.c | 4 +- src/tools/tor-resolve.c | 4 +- 25 files changed, 581 insertions(+), 35 deletions(-)