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

[arma at torproject.org]

commit 5f93885cde396fd00462e450dd00abb36f90975d
Merge: 877e177 2bf0e74
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Sep 6 20:55:27 2011 -0400

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug3898a         |    6 ++++++
 changes/bug3923          |    5 +++++
 changes/msvc_lround      |    4 ++++
 doc/tor.1.txt            |   19 ++++++++++---------
 src/common/util.c        |    4 ++++
 src/or/connection_edge.c |   10 ++++------
 6 files changed, 33 insertions(+), 15 deletions(-)