Merge branch 'maint-0.2.4' into release-0.2.4
commit92f8b56e27450f3646ea1b2a5751fce9e77beb86
authorNick Mathewson <nickm@torproject.org>
Mon, 13 Feb 2017 19:39:10 +0000 (13 14:39 -0500)
committerNick Mathewson <nickm@torproject.org>
Mon, 13 Feb 2017 19:39:10 +0000 (13 14:39 -0500)
treee9487420c22aa408faa6fe6647b30d44a5fc4e13
parent8bcc14f62e620c4a15084449c335680096511001
parentf6016058b42aa1c4528fd8c7c2da3d13eddd63dc
Merge branch 'maint-0.2.4' into release-0.2.4