Public Git Hosting - tor.git/commit

commit	a8d6eb30b88ec56e2bdef9d8a12ff308fa0223b5
author	Nick Mathewson <nickm@torproject.org>
	Mon, 20 Oct 2014 14:26:19 +0000 (20 10:26 -0400)
committer	Nick Mathewson <nickm@torproject.org>
	Mon, 20 Oct 2014 14:26:19 +0000 (20 10:26 -0400)
tree	a544c62ff8b782f589c90a22860cafbea57ad683	tree \| snapshot (tar.gz zip)
parent	6b2ed1a905ce2ca50a480d319368b676de124d6d	commit \| diff
parent	e2112dd0c021fb620e90dbef3456f96635982cfc	commit \| diff

Merge branch 'maint-0.2.4' into release-0.2.4

Conflicts:
configure.ac