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

[nickm at torproject.org]

commit 48cdcc9d4ad12b7c57c8ac578db5961da27fde85
Merge: e4abac0 c442d85
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 25 10:21:01 2012 -0400

    Merge branch 'link_negotiation_assert_024'

 changes/link_negotiation_assert |    6 ++++++
 src/or/channeltls.c             |    9 +++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)