[tor-commits] [tor/master] Merge branch 'bug7799_rebased' into maint-0.2.4

[nickm at torproject.org]

commit 33f86faa5a20c3c2b7c6be386186bb01b5883739
Merge: 96c0a42 d39e673
Author: Nick Mathewson <nickm at torproject.org>
Date:   Fri Mar 29 12:17:35 2013 -0400

    Merge branch 'bug7799_rebased' into maint-0.2.4

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