commit 2cdd631f5ca93e8bed5ad741881d4b332a81ebc3 Merge: 517b9c6 f89de0a Author: Nick Mathewson nickm@torproject.org Date: Wed May 16 11:31:40 2012 -0400

Merge branch 'bug5380'

changes/bug5380 | 5 +++++ src/or/circuitbuild.c | 6 +++++- 2 files changed, 10 insertions(+), 1 deletions(-)