Merge branch 'maint-0.2.7' into maint-0.2.8
commit2ee3dbe8018aa4c4b1988df77ccc6a6fda753ea9
authorNick Mathewson <nickm@torproject.org>
Mon, 13 Jun 2016 14:49:05 +0000 (13 10:49 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 13 Jun 2016 14:49:05 +0000 (13 10:49 -0400)
treefd9abdb209f158705a81cba4dd2ffa6ffb52f765
parentada5668c5e2c32e7419091221627bff8b4d254fe
parent80089c9e7c16f38e398e99cbc773c3182cee9229
Merge branch 'maint-0.2.7' into maint-0.2.8