Merge branch 'maint-0.2.8' into release-0.2.8
commitfc4a3b30c8e329d408eb2e6bd922f5cb8a5ff10b
authorNick Mathewson <nickm@torproject.org>
Thu, 26 May 2016 16:12:41 +0000 (26 12:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Thu, 26 May 2016 16:12:41 +0000 (26 12:12 -0400)
tree3ac6f40db011ea3601878932884213400156e0e2
parentcd12ee6740a5495e5edf5ecfc7f457b1bad2efb2
parenta873ba8edda40e4bc43e887d5f46a50eebb8b2ab
Merge branch 'maint-0.2.8' into release-0.2.8