[tor-commits] [tor/master] Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2

[nickm at torproject.org]

commit 335ff915c7a509eb1b76e67f88c7b65d20032035
Merge: 06f0c1a 93d52f6
Author: Nick Mathewson <nickm at torproject.org>
Date:   Tue Jul 5 15:52:11 2011 -0400

    Merge remote-tracking branch 'rransom-tor/bug3465-022' into maint-0.2.2

 changes/bug3465-022   |    6 ++++++
 src/or/circuitbuild.c |   10 +++++-----
 src/or/circuitlist.c  |    2 +-
 src/or/control.c      |    3 ++-
 4 files changed, 14 insertions(+), 7 deletions(-)