From: Peter Palfrader Date: Fri, 29 Jul 2016 16:09:07 +0000 (+0000) Subject: Merge branch 'master' of file:///srv/puppet.debian.org/git/dsa-puppet X-Git-Url: https://wiki.adam-barratt.org.uk/gitweb/?a=commitdiff_plain;h=fc95b6d72d45500b18c27e1f73ab500532f74769;p=mirror%2Fdsa-puppet.git 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 --- fc95b6d72d45500b18c27e1f73ab500532f74769