commit 16b8b9b00f414343030c29990930c0e52a01fd84 Merge: 530e87c a2727f6 Author: Nick Mathewson nickm@torproject.org Date: Tue Feb 22 18:38:03 2011 -0500

Merge remote branch 'arma/bug2403' into maint-0.2.2

changes/bug2403 | 6 ++++++ src/or/circuitbuild.c | 3 ++- 2 files changed, 8 insertions(+), 1 deletions(-)