Merge branch 'maint-0.2.8' into release-0.2.8
commit5b57f88f6097e92a052cd8d381587cee1dea6006
authorNick Mathewson <nickm@torproject.org>
Mon, 27 Jun 2016 17:20:57 +0000 (27 13:20 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 27 Jun 2016 17:20:57 +0000 (27 13:20 -0400)
treef5f42a9d804d5bc34a065b3b632a75557453fe51
parentcc6fcbde4ea11ef66a9e0c3fe62d007491f8cb22
parent0116eae59a35e4303ca179d6b0fb0302a83e87a1
Merge branch 'maint-0.2.8' into release-0.2.8