Merge branch 'maint-0.2.8' into release-0.2.8
commite32281b00095dbc764e995cf57290c9c1b0c9660
authorNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 20:12:10 +0000 (25 16:12 -0400)
committerNick Mathewson <nickm@torproject.org>
Wed, 25 May 2016 20:12:10 +0000 (25 16:12 -0400)
tree9335c50c099b5848c21f5307b61d1263ef758ca9
parent693e48a5a4dc0bd537e00134606268b6b91afce0
parentf2d614c3d93aceac4954f7cd593213a5fcfbb123
Merge branch 'maint-0.2.8' into release-0.2.8