[tor-commits] [tor/release-0.2.4] Merge remote-tracking branch 'public/bug8059' into maint-0.2.4

[arma at torproject.org]

commit 173efa10515e23b45e37f96a3755a2f16411a71a
Merge: 57ffef3 b903752
Author: Nick Mathewson <nickm at torproject.org>
Date:   Mon Mar 18 14:31:50 2013 -0400

    Merge remote-tracking branch 'public/bug8059' into maint-0.2.4

 changes/bug8059     |    6 ++++++
 src/or/channeltls.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletions(-)