Merge branch 'maint-0.2.8' into release-0.2.8
commit1e97b6afc62388a6835d92c6fc9543cfa8caf964
authorNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 12:17:11 +0000 (19 08:17 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 19 May 2016 12:17:11 +0000 (19 08:17 -0400)
tree3a618cdf9362c806cf7cf2f0b9618a0e2282cd6f
parentef03dc0cd3a4eb53a2728ac201dedbd71ff51a21
parent9f217c83b0d91508af0d63f04216fa78cdbfbe1b
Merge branch 'maint-0.2.8' into release-0.2.8