Merge branch 'maint-0.2.4' into release-0.2.4
commit956c61ec23e8e4861f852473292c2c54abb7f614
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:19:18 +0000 (20 18:19 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:19:18 +0000 (20 18:19 -0500)
tree64e8cc2cf959c5f0ce6cf1e88df6c629141762c7
parentec3df7cbd2d122d66bab7c389715ff9579eb0899
parent8f857c23b755cda41dbb8adf6b14d5defb76a00c
Merge branch 'maint-0.2.4' into release-0.2.4