Merge branch 'maint-0.2.4' into release-0.2.4
commit0e2f18868cc7634cf4ef8bc7823f61cd301497ba
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:51:28 +0000 (5 13:51 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 17:51:28 +0000 (5 13:51 -0400)
tree6cee7f3cf55a6eb785b5e1b162f00ae0586d7109
parentfd6ba23f7bb4c47cedbfd65053b1148659b9d863
parent6b8c3d2bc020035c2627fa0ffcc22c036270e122
Merge branch 'maint-0.2.4' into release-0.2.4