[tor-commits] [tor/release-0.2.4] Merge branch 'bug10456' into maint-0.2.4

[arma at torproject.org]

commit 2c956f0c99beed22ada43ba9458302308af87884
Merge: dabdc33 b5d13d1
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Dec 21 21:15:39 2013 -0500

    Merge branch 'bug10456' into maint-0.2.4

 changes/bug10456    |    6 ++++++
 src/or/circuituse.c |    2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)