commit e665ec6409c253ebbbf7ae0ef2601fe7c8afba7b Merge: 617617e efba71b Author: Nick Mathewson nickm@torproject.org Date: Sun Nov 27 09:18:55 2011 -0500

Merge remote-tracking branch 'asn/bug4584'

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