Merge branch 'maint-0.2.8'
commita7e317927b9901a5b1d1d8de010093816da76425
authorNick Mathewson <nickm@torproject.org>
Fri, 12 Aug 2016 14:27:23 +0000 (12 10:27 -0400)
committerNick Mathewson <nickm@torproject.org>
Fri, 12 Aug 2016 14:27:23 +0000 (12 10:27 -0400)
tree938e39caa83d4816321a863310a6270dea4c2194
parente788c577f11ef4c0309e9d5298bf57639c0ebb06
parent459e5d705eb688642d53f38c00e0a2c6cfd36b8a
Merge branch 'maint-0.2.8'