fold in the latest changes
commitc3febf8660518f77ec890afe339c353dfcb61a87
authorRoger Dingledine <arma@torproject.org>
Fri, 9 Jul 2010 18:07:54 +0000 (9 14:07 -0400)
committerRoger Dingledine <arma@torproject.org>
Fri, 9 Jul 2010 18:07:54 +0000 (9 14:07 -0400)
tree867c6f9feed4533eea4e3c39f8d8f3aa317d9296
parentf72c6f91deed6b076fd730d049c3bddbbb3eb329
fold in the latest changes
ChangeLog
changes/bug1564 [deleted file]
changes/cbt-bugfixes [deleted file]