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

[arma at torproject.org]

commit 5d672c1b71a88818c8043277c60a225fa1ba6eda
Merge: 0eaebae acfd487
Author: Roger Dingledine <arma at torproject.org>
Date:   Tue Sep 4 20:15:58 2012 -0400

    Merge branch 'maint-0.2.3' into release-0.2.3

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