Merge branch 'maint-0.2.8' into release-0.2.8
commitcc6fcbde4ea11ef66a9e0c3fe62d007491f8cb22
authorNick Mathewson <nickm@torproject.org>
Wed, 22 Jun 2016 12:19:51 +0000 (22 08:19 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 22 Jun 2016 12:19:51 +0000 (22 08:19 -0400)
tree1284b304e659c71143e9306c90b638d43851930b
parentcf131890643a6db64e39dee7ef1d7fef3d19b16c
parent421a7c8c35064993cf4ce344e4b0fab06e7df3a4
Merge branch 'maint-0.2.8' into release-0.2.8