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

[nickm at torproject.org]

commit f8c1ab7bbf7e7f4528406ae5ba7837866642549d
Merge: 0770e4c 9d9ca26
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 5 16:25:13 2012 -0400

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

 changes/bug6774       |    4 ++++
 src/or/circuitbuild.c |    6 ++++++
 2 files changed, 10 insertions(+), 0 deletions(-)