Merge branch 'maint-0.2.4' into release-0.2.4
commit8e6174e38906105e32690c54936eef19e0946103
authorNick Mathewson <nickm@torproject.org>
Thu, 7 Apr 2016 14:46:22 +0000 (7 10:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 7 Apr 2016 14:46:22 +0000 (7 10:46 -0400)
treea5bd7be26ab0635447831307c0428cdab5f0d896
parent7bb4422a93eb347a944a25e1451c882e3060d5cb
parent97c6e717b9f3f198163c6d5b4bde86e7f3da28d0
Merge branch 'maint-0.2.4' into release-0.2.4