[tor-commits] [tor/master] Merge remote-tracking branch 'public/bug6033' into maint-0.2.2

[nickm at torproject.org]

commit 6d85a796539424882f878ccac5ae4640a6fbb561
Merge: b7e863c 841a8d5
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Jun 4 11:33:27 2012 -0400

    Merge remote-tracking branch 'public/bug6033' into maint-0.2.2

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