Merge branch 'maint-0.2.8' into release-0.2.8
commit2728a12232cf3e93986493488a4042e02f704f30
authorNick Mathewson <nickm@torproject.org>
Sat, 11 Jun 2016 14:16:36 +0000 (11 10:16 -0400)
committerNick Mathewson <nickm@torproject.org>
Sat, 11 Jun 2016 14:16:36 +0000 (11 10:16 -0400)
treebd3dfc3074755fc0129e4fd3499cbef0d194555b
parent399eebea5480f9515e8a9cd204cd8c5b0dc544db
parentada5668c5e2c32e7419091221627bff8b4d254fe
Merge branch 'maint-0.2.8' into release-0.2.8