Public Git Hosting - torspec/rransom.git/commit

commit	86b25974e51c42d17274ce90db23d1ec65bb8fa0
author	Nick Mathewson <nickm@torproject.org>
	Tue, 15 Dec 2009 22:26:09 +0000 (15 17:26 -0500)
committer	Nick Mathewson <nickm@torproject.org>
	Tue, 15 Dec 2009 22:26:09 +0000 (15 17:26 -0500)
tree	30cdfb9be6cbbb9917b56dbaaa6547727a3cdea3	tree \| snapshot (tar.gz zip)
parent	e23af39b5b7e816fb721172c89467779a78ea033	commit \| diff
parent	e273c414661ef16893472a68a620641cb91de097	commit \| diff

Merge branch 'safelogging2'

Conflicts:
ChangeLog