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

[arma at torproject.org]

commit 0126150c2d42c028c208529caf853c0d19ec4f5f
Merge: c78a314 8d5c0e5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Jan 11 11:07:13 2012 -0500

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

 src/common/tortls.c |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)