[tor-commits] [tor/master] Merge remote-tracking branch 'origin/maint-0.2.4'

[nickm at torproject.org]

commit bbc85b18ca9c3e50fedd783e34f4a866a4960922
Merge: b98c588 2c956f0
Author: Nick Mathewson <nickm at torproject.org>
Date:   Sat Dec 21 21:16:06 2013 -0500

    Merge remote-tracking branch 'origin/maint-0.2.4'

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