backport r10240 and r10242
commit6ae73ad808bc6aac4aea1cae8da8c7cb87bcee45
authorRoger Dingledine <arma@torproject.org>
Thu, 24 May 2007 17:31:59 +0000 (24 17:31 +0000)
committerRoger Dingledine <arma@torproject.org>
Thu, 24 May 2007 17:31:59 +0000 (24 17:31 +0000)
tree964bc8cd4e541681add645575cd572d102955a4e
parenta6d2f877f516c9747282e5716d5e774b0bc06d19
backport r10240 and r10242

svn:r10310
ChangeLog
src/or/circuitbuild.c