From: Micah <micah@riseup.net>
Date: Fri, 11 Mar 2016 20:53:08 +0000 (+0000)
Subject: Merge branch 'master' into 'master'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;p=puppet-tor.git

Merge branch 'master' into 'master'

Fix deprecated variable references



See merge request !3
---

fd7aad3cb5fb7f8db73ef5dbe2cbab9ab4868325