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

[nickm at torproject.org]

commit 62f8e3926d62ff4aaefedfe89355f04f3a8d74fa
Merge: 0b1a334 f021219
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu May 10 15:55:12 2012 -0400

    Merge remote-tracking branch 'public/bug4591'

 changes/bug4591     |    6 ++++++
 src/common/tortls.c |    4 +++-
 2 files changed, 9 insertions(+), 1 deletions(-)