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

[arma at torproject.org]

commit 121ae29ed952a7203f0d96a60fef2f52d5cae23e
Merge: 6cd6889 688903e
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Feb 2 02:33:03 2012 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug4012_022   |    3 +++
 changes/bug4533_part2 |    5 +++++
 changes/bug5005       |    3 +++
 doc/tor.1.txt         |   15 ++++++++++-----
 src/common/compat.h   |    2 +-
 src/common/tortls.c   |    4 ++--
 6 files changed, 24 insertions(+), 8 deletions(-)