Merge branch 'maint-0.2.8' into release-0.2.8
commitfd34049f3d565e906d4c1e9b73332f61ebfe7673
authorNick Mathewson <nickm@torproject.org>
Fri, 20 May 2016 14:46:45 +0000 (20 10:46 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 20 May 2016 14:46:45 +0000 (20 10:46 -0400)
tree57c63f99373b171299d4be18432add56417bbedd
parentf2824887e326e9fdc5f096f99d4dfe4aeee4d79a
parent50cbf220994c7cec5939666cbf990acb4aaa46c6
Merge branch 'maint-0.2.8' into release-0.2.8