[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug3264'

[nickm at torproject.org]

commit 4186b1362b21e6af822579cd77ec46f63219e574
Merge: 37ff37a 410e440
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jun 21 10:28:25 2011 -0400

    Merge remote-tracking branch 'public/bug3264'

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