[tor-commits] [tor/release-0.2.3] Merge branch 'link_negotiation_assert_023' into release-0.2.3

[nickm at torproject.org]

commit da336312eb7fde5cdc311465e2a9036ac60273e7
Merge: 89dc27b 758428d
Author: Nick Mathewson <nickm at torproject.org>
Date:   Thu Oct 25 10:15:03 2012 -0400

    Merge branch 'link_negotiation_assert_023' into release-0.2.3

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