Public Git Hosting - torspec/rransom.git/commit

commit	6d6009e6db0ba7cad35dc072a29d07102ff69da5
author	Roger Dingledine <arma@torproject.org>
	Wed, 1 Dec 2010 05:11:27 +0000 (1 00:11 -0500)
committer	Roger Dingledine <arma@torproject.org>
	Wed, 1 Dec 2010 05:11:27 +0000 (1 00:11 -0500)
tree	8bc39dafd68d2bbad5edc43d62d1ec46a3ad3d2d	tree \| snapshot (tar.gz zip)
parent	6f5886dd1b5a93a1c2c4d521db28e7974224ee2a	commit \| diff
parent	4f2f7672dc194e3003ce5497ed9cf7ee23d30912	commit \| diff

Merge branch 'maint-0.2.1' into maint-0.2.2

Conflicts:

doc/Makefile.am