commit 972564630e8f85499e611f1eeb7174d0c0230731 Merge: 16dbcaf 3ae9684 Author: Nick Mathewson <nickm@torproject.org> Date: Thu Nov 3 13:23:59 2011 -0400 Merge branch 'bug4383_nm' into maint-0.2.2 changes/bug4383 | 5 +++++ src/or/circuitbuild.c | 3 ++- 2 files changed, 7 insertions(+), 1 deletions(-)