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

commit 3f41df30056181e9f4c80436e088c8ed58f01677 Merge: 8955b25 97a209e Author: Roger Dingledine arma@torproject.org Date: Mon Nov 21 19:18:09 2011 -0500

Merge branch 'maint-0.2.2' into release-0.2.2

changes/bug3963 | 5 +++++ changes/bug4518 | 4 ++++ changes/bug4521 | 3 +++ changes/feature4484 | 8 ++++++++ doc/tor.1.txt | 10 ++++++++++ src/common/compat.h | 2 +- src/common/util.c | 2 ++ src/or/config.c | 8 ++++++++ src/or/cpuworker.c | 14 ++++++++++++-- src/or/dirserv.c | 24 ++++++++++++------------ src/or/ntmain.c | 2 +- src/or/or.h | 8 ++++++++ 12 files changed, 74 insertions(+), 16 deletions(-)