commit 3621f30ad44973acef1ae0dc2e723fd8c9f1dc0d Merge: f25e8d0 4e42a8a Author: Nick Mathewson nickm@torproject.org Date: Fri Aug 17 12:08:42 2012 -0400

Merge remote-tracking branch 'mikeperry/bug6475' into maint-0.2.3

changes/bug6475 | 6 ++ src/or/circuitbuild.c | 236 ++++++++++++++++++++++++++++++++++++++++++------- src/or/or.h | 21 +++++ 3 files changed, 229 insertions(+), 34 deletions(-)