[tor-commits] [tor/master] Merge remote-tracking branch 'sebastian/bug3700'

[nickm at torproject.org]

commit 70216cb096b5b5daea78abe50681ad1537d584a0
Merge: 8c643b5 f137ae8
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Aug 11 14:42:15 2011 -0400

    Merge remote-tracking branch 'sebastian/bug3700'

 changes/bug3700     |    6 ++++++
 src/common/tortls.c |   16 ++++++++++++++++
 2 files changed, 22 insertions(+), 0 deletions(-)