[tor-commits] [tor/master] Merge remote-tracking branch 'arma/bug6743' into maint-0.2.3

[nickm at torproject.org]

commit acfd487e7dbf5fa1408a2bba7afff54bc7d0118e
Merge: 4bd90e2 eb3d079
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Sep 4 18:33:56 2012 -0400

    Merge remote-tracking branch 'arma/bug6743' into maint-0.2.3

 changes/bug6743     |    9 +++++++++
 src/or/circuituse.c |    2 +-
 2 files changed, 10 insertions(+), 1 deletions(-)