[tor-commits] [tor/master] Merge branch 'block_renegotiate_024'

[nickm at torproject.org]

commit e8f547c181e9b86fa590280c579fd3be495824ce
Merge: 2c2c642 3d8b73d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 19 14:32:42 2012 -0400

    Merge branch 'block_renegotiate_024'

 changes/cve-2012-2249  |    5 +++++
 src/or/channeltls.c    |    1 +
 src/or/connection_or.c |   14 ++++++++++++--
 src/or/connection_or.h |    1 +
 4 files changed, 19 insertions(+), 2 deletions(-)