Merge branch 'master' into tor
authorJoey Hess <joeyh@joeyh.name>
Wed, 7 Dec 2016 18:32:25 +0000 (14:32 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 7 Dec 2016 18:32:25 +0000 (14:32 -0400)
commit2fb6fd743458a3e3dc828e830a3b13e7615208d0
tree73b05862fa531ffb511e6adae759c9ad5e8d6237
parentad5ef51040f4220dd27cb8bfd2951ca1145c8c0e
parentf2354ddef55da2e95e3b3f4aecd263b72cdcf85a
Merge branch 'master' into tor
CHANGELOG