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

[arma at torproject.org]

commit 3cebc5e73c2db10bbe2c2259e3f4dd1c57d39afa
Merge: 8611195 4f3dbb3
Author: Nick Mathewson <nickm at torproject.org>
Date:   Wed Sep 4 16:04:47 2013 -0400

    Merge branch 'bug9671_023' into maint-0.2.3

 changes/bug9671_023   |    5 +++++
 src/or/circuitbuild.c |    2 +-
 src/or/circuitbuild.h |    1 +
 src/or/circuituse.c   |    4 ++--
 4 files changed, 9 insertions(+), 3 deletions(-)