Merge branch 'master' into tor

This commit is contained in:
Joey Hess 2016-11-30 14:16:36 -04:00
commit 24593aaa32
No known key found for this signature in database
GPG key ID: C910D9222512E3C7
4 changed files with 25 additions and 11 deletions

2
debian/control vendored
View file

@ -112,7 +112,7 @@ Recommends:
nocache,
aria2,
Suggests:
graphviz,
xdot,
bup,
tahoe-lafs,
libnss-mdns,