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

[arma at torproject.org]

commit 0640d09bf4be273fa4cfc18c30de30677a6d24fa
Merge: 1eec073 3ab0976
Author: Roger Dingledine <arma at torproject.org>
Date:   Thu Jul 7 13:26:50 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug3536          |    5 +++++
 doc/tor.1.txt            |   14 +++++++-------
 src/or/connection_edge.c |    3 ++-
 3 files changed, 14 insertions(+), 8 deletions(-)