Public Git Hosting - tor.git/commit

commit	0eb03bc6ddb9ea13eb7902c47a8c782f084bddc1
author	Nick Mathewson <nickm@torproject.org>
	Sat, 20 Feb 2010 23:35:19 +0000 (20 18:35 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Sat, 20 Feb 2010 23:35:19 +0000 (20 18:35 -0500)
tree	c4c7fe68a33bfb2dd38c2cde605b27c463c433a1	tree \| snapshot (tar.gz zip)
parent	391f75d7927959bb2d77c5adb184c53e17b72cac	commit \| diff
parent	061ffbd7d563d270a2e311f7c47bc434cf913a40	commit \| diff

Merge remote branch 'public/cbt-status'

Conflicts:
ChangeLog