Merge branch 'maint-0.2.8' into release-0.2.8
commit6220cd13c517f18c8a1cb1c5bc350f3e2a7eafac
authorNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:52:24 +0000 (5 12:52 -0400)
committerNick Mathewson <nickm@torproject.org>
Tue, 5 Jul 2016 16:52:24 +0000 (5 12:52 -0400)
treee1de800eebf151d1956e83781cb2348b7702cbc0
parente512e6ca59ff86852e29ffe6fbb9d2bdb8688e82
parente99cc8740f793ba3796408c6f23bf35f12572193
Merge branch 'maint-0.2.8' into release-0.2.8