Merge branch 'maint-0.2.7' into maint-0.2.8
commit9ff76185d284f1982b5f49b2c652f7a05e71ba2b
authorRoger Dingledine <arma@torproject.org>
Mon, 13 Feb 2017 20:39:13 +0000 (13 15:39 -0500)
committerRoger Dingledine <arma@torproject.org>
Mon, 13 Feb 2017 20:39:13 +0000 (13 15:39 -0500)
tree46b062f4839fcec70b7a2692b89b35cd66af3322
parent9b90d515a9fc52c2579d55406e78de8d2fb5fa19
parent5c4235888af142b72aa6b88737bcf1020797e35c
Merge branch 'maint-0.2.7' into maint-0.2.8