commit 0be2934186da8683558404fe465407054421dd53 Merge: e273890 ca6efcf Author: Nick Mathewson nickm@torproject.org Date: Tue Jul 5 16:01:07 2011 -0400

Merge remote-tracking branch 'rransom-tor/bug3465-023-v2'

changes/bug3465-022 | 6 +++ changes/bug3465-023 | 6 +++ src/or/circuitbuild.c | 10 ++-- src/or/circuitlist.c | 2 +- src/or/control.c | 115 +++++++++++++++++++++++++------------------------ 5 files changed, 76 insertions(+), 63 deletions(-)