Merge branch 'master' into tor
authorJoey Hess <joeyh@joeyh.name>
Wed, 30 Nov 2016 18:16:36 +0000 (14:16 -0400)
committerJoey Hess <joeyh@joeyh.name>
Wed, 30 Nov 2016 18:16:36 +0000 (14:16 -0400)
commit24593aaa32915f897ea3c921af2a2911f10869af
tree3165ee8bc0492cb83079f7a2d6f2aaf5347f45d0
parentb039e5cc35f7f7078270db5135e73ece8cab72c2
parent8354612131df127729545fcefde5e4f8aa0d7851
Merge branch 'master' into tor
CHANGELOG
debian/control