Merge branch 'maint-0.2.4' into release-0.2.4
commitec3df7cbd2d122d66bab7c389715ff9579eb0899
authorNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:05:47 +0000 (20 18:05 -0500)
committerNick Mathewson <nickm@torproject.org>
Tue, 20 Dec 2016 23:05:47 +0000 (20 18:05 -0500)
tree0e4ddb9e738a1643addf6cdc9069a56431da9b6a
parentce12cde92c023f8ce5d227a7526c01279cbce132
parent0fb3058eced5dce355d777288bd9ec255b875db4
Merge branch 'maint-0.2.4' into release-0.2.4