[tor-commits] [tor/maint-0.2.2] Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

[nickm at torproject.org]

commit ccd8289958b6d81cd5575c15dc6c1218d8ecb2d0
Merge: a1074c7 b839ace
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 5 14:16:30 2012 -0500

    Merge remote-tracking branch 'origin/maint-0.2.1' into maint-0.2.2

 changes/bug4822     |   13 +++++++++++++
 src/common/tortls.c |   37 ++++++++++++++++++++++++++++++++++---
 2 files changed, 47 insertions(+), 3 deletions(-)