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

[arma at torproject.org]

commit 6cd68895fb373cc10825368ecfa345a100da7ac4
Merge: 0a77d53 c78a314
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Jan 10 20:26:50 2012 -0500

    Merge branch 'maint-0.2.2' into release-0.2.2

 changes/bug4856      |    3 +++
 src/common/tortls.c  |   13 ++++---------
 src/or/rendservice.c |    2 +-
 3 files changed, 8 insertions(+), 10 deletions(-)