Merge branch 'maint-0.2.8' into release-0.2.8
commit399eebea5480f9515e8a9cd204cd8c5b0dc544db
authorNick Mathewson <nickm@torproject.org>
Mon, 6 Jun 2016 14:17:57 +0000 (6 10:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 6 Jun 2016 14:17:57 +0000 (6 10:17 -0400)
treeadb82feff7b9907f878b043a92497dc1cee5dda3
parentdc624a7db11b618d858149e68f9f2114a9d17713
parent6eeedc02d8aee0bf1eda8e592764ec9c5df4add7
Merge branch 'maint-0.2.8' into release-0.2.8