Merge branch 'maint-0.2.8' into release-0.2.8
commit876032555030d9a443a343261cbf97a10319cf19
authorNick Mathewson <nickm@torproject.org>
Mon, 13 Jun 2016 17:57:09 +0000 (13 13:57 -0400)
committerNick Mathewson <nickm@torproject.org>
Mon, 13 Jun 2016 17:57:09 +0000 (13 13:57 -0400)
tree0c0866b6723d9b83998705e7cf65e3a912e4603a
parentef8710658322724a2bf2da698593c9cb966a8d2e
parent60b8aaefa1b1d0d828f04778df970e65a87eb2d6
Merge branch 'maint-0.2.8' into release-0.2.8