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

[arma at torproject.org]

commit b839ace7d092fe073b66a2d7d329644e82ec843b
Merge: df17b62 4752b34
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Jan 5 14:11:42 2012 -0500

    Merge branch 'bug4822_021_v2_squashed' into maint-0.2.1

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