backport r14162-r14164
commit981ad6021d16ac580ab638afc46956dc50c12a7c
authorRoger Dingledine <arma@torproject.org>
Mon, 24 Mar 2008 19:14:48 +0000 (24 19:14 +0000)
committerRoger Dingledine <arma@torproject.org>
Mon, 24 Mar 2008 19:14:48 +0000 (24 19:14 +0000)
treee8d4c8c42488700252c7b7183edf2d9d15027bb3
parentef551d7d263d6dcc569c647e7b2bd5385b11dded
backport r14162-r14164

svn:r14167
ChangeLog
src/or/circuituse.c
src/or/connection_edge.c
src/or/or.h