Merge commit 'mikeperry/bug1740' into maint-0.2.2
commit474e4d2722d52cf225a88cb7b7c677273b8f50ac
authorRoger Dingledine <arma@torproject.org>
Wed, 29 Sep 2010 21:05:38 +0000 (29 17:05 -0400)
committerRoger Dingledine <arma@torproject.org>
Wed, 29 Sep 2010 21:05:38 +0000 (29 17:05 -0400)
tree0ebc666681cfbce8655f72330c3139b02a2a5376
parenta58610a87e27e446b347f49e847da1cd460ffa81
parentcaba3bc57e2895a7c51a87e23fa783b9c48892a5
Merge commit 'mikeperry/bug1740' into maint-0.2.2
src/or/circuitbuild.c
src/or/circuitbuild.h
src/or/circuituse.c
src/or/or.h