Merge branch 'maint-0.2.8' into release-0.2.8
commit803fa75f7f5a8bc5b94aebfc5be81d5a05d679b4
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:23:35 +0000 (5 12:23 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:23:35 +0000 (5 12:23 -0400)
tree754b613daeabcf3572d0e781adf62e511faea0dd
parent017245074e3a2c1c7ad4375911a586367e036b04
parentf4408747d3e8de35f6beaf37535315b907c87656
Merge branch 'maint-0.2.8' into release-0.2.8