commit 329e1c65d3c73ad7b3b4cdaa870dd04fd7fb01b7 Merge: 75b72bf 6d85a79 Author: Nick Mathewson nickm@torproject.org Date: Mon Jun 4 11:36:33 2012 -0400

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

changes/bug6033 | 6 ++++++ src/common/tortls.c | 15 +++++++++++++++ 2 files changed, 21 insertions(+), 0 deletions(-)