Merge branch 'immerda-merge' into 'master'
authorLouis-Philippe Véronneau <pollito@riseup.net>
Tue, 6 Mar 2018 17:29:54 +0000 (17:29 +0000)
committerLouis-Philippe Véronneau <pollito@riseup.net>
Tue, 6 Mar 2018 17:29:54 +0000 (17:29 +0000)
Immerda merge

Closes #2

See merge request shared-puppet-modules-group/tor!19


Trivial merge