Merge branch 'maint-0.2.4' into release-0.2.4
commit22bdc694290c48e959a44e9937d04b0b576e765d
authorNick Mathewson <nickm@torproject.org>
Thu, 12 Mar 2015 14:50:28 +0000 (12 10:50 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 12 Mar 2015 14:50:28 +0000 (12 10:50 -0400)
treec9f07f2a32421422a188bd6b755f93d3559be3ba
parent9e44ed47acc9805e77c2d6aa562845a71ea9db5c
parent5f46a59ba394a1b45ecc1ee52514998e774d3dca
Merge branch 'maint-0.2.4' into release-0.2.4