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)
commitfc95b6d72d45500b18c27e1f73ab500532f74769
tree119fb9be3aea4894b4f30dc09a72a5671b613b58
parentb659c5499f41972c15f2e6e4268be02e20b70bed
parente35ca9ee88e46202339ae885d232aca681985381
Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet

* 'master' of file:///srv/puppet.debian.org/git/dsa-puppet:
  use busoni instead of mirror-anu for tor static