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

[nickm at torproject.org]

commit c3cc79ec38269291f5c066e5f91b32ed4ff473f9
Merge: 097a08f 33f86fa
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 29 12:19:05 2013 -0400

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

 changes/bug7799     |    7 +++++++
 src/or/circuituse.c |   28 +++++++++++++++++++++-------
 2 files changed, 28 insertions(+), 7 deletions(-)