Merge branch 'maint-0.2.8' into release-0.2.8
commit1cdb839108ef7487aaa516ab003d1afd7abfecc6
authorNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 00:21:32 +0000 (14 20:21 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 15 Jun 2016 00:21:32 +0000 (14 20:21 -0400)
treed247cb62a480433f906980e2c30d066cc2788afd
parent299f892815bff3aea4b1b2c3bd6b925d94c37a08
parentd6b01211b94d0f346a408eef78e04a8d0ffbb51f
Merge branch 'maint-0.2.8' into release-0.2.8