commit 1e5d66997bb6efae378cf8783a0b07c12dd7146f Merge: 838ec08 c78a314 Author: Nick Mathewson nickm@torproject.org Date: Mon Jan 9 16:40:42 2012 -0500

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

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