Merge branch 'maint-0.2.4' into release-0.2.4
commitb4d81f182c7a01e6099dc4e8afe4349c039be745
authorRoger Dingledine <arma@torproject.org>
Tue, 16 Apr 2013 15:09:50 +0000 (16 11:09 -0400)
committerRoger Dingledine <arma@torproject.org>
Tue, 16 Apr 2013 15:09:50 +0000 (16 11:09 -0400)
tree097305b4cdb8177f0a4e8be5dc05c479e4d33539
parent887eba98950f2974bd2031510e1ece2279a4f106
parenta6545d6335cd7829cdc9c0d7ce2e61b775bcca1d
Merge branch 'maint-0.2.4' into release-0.2.4
configure.ac