[tor-commits] [tor/release-0.2.4] Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4

[nickm at torproject.org]

commit 411c622906c0b6b071874634781684c65485898a
Merge: 0ad8133 bb9b4c3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed May 7 23:11:32 2014 -0400

    Merge commit 'bb9b4c37f8e7f5cf78918f382e90d8b11ff42551' into maint-0.2.4

 changes/bug11553      |    5 +++++
 src/or/channel.h      |    2 ++
 src/or/circuitbuild.c |    9 ++++++++-
 3 files changed, 15 insertions(+), 1 deletion(-)