commit f37181620951d2e7a13f1363386563115d628761 Merge: 53d88eb 0126150 Author: Nick Mathewson <nickm@torproject.org> Date: Wed Jan 11 11:07:37 2012 -0500 Merge remote-tracking branch 'origin/maint-0.2.2' src/common/tortls.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)