Merge branch 'maint-0.2.8' into release-0.2.8
commitef8710658322724a2bf2da698593c9cb966a8d2e
authorNick Mathewson <nickm@torproject.org>
Mon, 13 Jun 2016 14:49:15 +0000 (13 10:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 13 Jun 2016 14:49:15 +0000 (13 10:49 -0400)
tree48d7c07412342a460b8a55f8b9519d4901a969d8
parent2728a12232cf3e93986493488a4042e02f704f30
parent2ee3dbe8018aa4c4b1988df77ccc6a6fda753ea9
Merge branch 'maint-0.2.8' into release-0.2.8