commit 385c59798af80e2609b66afb2998acb508060f95 Merge: df42eb0 7039c34 Author: Nick Mathewson nickm@torproject.org Date: Thu Jun 2 12:55:56 2011 -0400

Merge remote-tracking branch 'arma/bug3321' into maint-0.2.2

changes/bug3321 | 7 +++++++ src/or/circuitbuild.c | 17 ++++++++++++----- 2 files changed, 19 insertions(+), 5 deletions(-)