Merge branch 'maint-0.2.8' into release-0.2.8
commit87ea2b6655d43ab95becf681e26a2092db17161e
authorNick Mathewson <nickm@torproject.org>
Tue, 28 Jun 2016 15:22:39 +0000 (28 11:22 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 28 Jun 2016 15:22:39 +0000 (28 11:22 -0400)
treeecf1b13513452a16da57d7ad29848245cbd26247
parent5b57f88f6097e92a052cd8d381587cee1dea6006
parentbc9a0f82b3436dad2aa09c1b68c0c230751d48dd
Merge branch 'maint-0.2.8' into release-0.2.8