Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet
authorPeter Palfrader <peter@palfrader.org>
Fri, 29 Jul 2016 16:09:07 +0000 (16:09 +0000)
committerPeter Palfrader <peter@palfrader.org>
Fri, 29 Jul 2016 16:09:07 +0000 (16:09 +0000)
* 'master' of file:///srv/puppet.debian.org/git/dsa-puppet:
  use busoni instead of mirror-anu for tor static


Trivial merge