From: Peter Palfrader <peter@palfrader.org>
Date: Fri, 20 Sep 2019 18:19:12 +0000 (+0200)
Subject: Tor#27849 is fixed, remove workaround
X-Git-Url: https://git.adam-barratt.org.uk/?a=commitdiff_plain;h=c4b8be30642ed0f2425d3ea70d59ffe328d4b5bb;p=mirror%2Fdsa-puppet.git

Tor#27849 is fixed, remove workaround
---

diff --git a/modules/onion/templates/torrc-header.erb b/modules/onion/templates/torrc-header.erb
index 57568154a..b45b81d96 100644
--- a/modules/onion/templates/torrc-header.erb
+++ b/modules/onion/templates/torrc-header.erb
@@ -1,10 +1,4 @@
-<%- if scope.function_has_role(['onionbalance']) -%>
-# Workaround https://trac.torproject.org/projects/tor/ticket/27849
-# FIXME: remove this when the bug is fixed
-SocksPort 9050
-<%- else -%>
 SocksPort 0
-<%- end -%>
 Log notice syslog
 
 <%- if has_variable?("tor_ge_0_2_9") && @tor_ge_0_2_9 -%>