commit 5b96773a40fb1290e3198c0f01d11b2fc0fe74bd Merge: 27b3b7a 47a2e5a Author: Nick Mathewson nickm@torproject.org Date: Mon May 2 20:21:08 2011 -0400

Merge remote-tracking branch 'sebastian/bug3047'

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