[tor-commits] [tor/master] Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4

[nickm at torproject.org]

commit 7f6aa780e3183f34b2fa771e17813018e6b28115
Merge: 9bb34aa c330d63
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sun Feb 9 21:41:24 2014 -0500

    Merge remote-tracking branch 'andrea/bug9602' into maint-0.2.4

 src/or/channeltls.c |   26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)