[tor-commits] [tor/master] Merge branch 'block_renegotiate_023' into maint-0.2.3

[nickm at torproject.org]

commit 1cc06bd35e4203569ecc72ff314a1dd543f60651
Merge: b6931b0 f357ef9
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Oct 19 14:30:31 2012 -0400

    Merge branch 'block_renegotiate_023' into maint-0.2.3

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