commit f38c085fba1a0f7cb9112d7aff365161738d48af Author: teor <teor2345@gmail.com> Date: Thu Nov 9 15:35:22 2017 +1100 Work around a Tor control port microdesc format bug When Tor uses microdescs, it uses a weird control port descriptor format (see Tor bug #24110). That confuses TorFlow, so we use descriptors instead. Fixes bug #24094. --- NetworkScanners/BwAuthority/data/tor.1/torrc | 2 ++ NetworkScanners/BwAuthority/data/tor.2/torrc | 2 ++ 2 files changed, 4 insertions(+) diff --git a/NetworkScanners/BwAuthority/data/tor.1/torrc b/NetworkScanners/BwAuthority/data/tor.1/torrc index 10cf915..1046c5b 100644 --- a/NetworkScanners/BwAuthority/data/tor.1/torrc +++ b/NetworkScanners/BwAuthority/data/tor.1/torrc @@ -7,6 +7,8 @@ DataDirectory ./data/tor.1 PidFile ./data/tor.1/tor.pid CookieAuthentication 1 FetchUselessDescriptors 1 +# Workaround for Tor #24110, tracked in TorFlow #24094 +UseMicrodescriptors 0 __LeaveStreamsUnattached 1 # Bad idea? Too much consensus update activity? diff --git a/NetworkScanners/BwAuthority/data/tor.2/torrc b/NetworkScanners/BwAuthority/data/tor.2/torrc index 979a687..64b6927 100755 --- a/NetworkScanners/BwAuthority/data/tor.2/torrc +++ b/NetworkScanners/BwAuthority/data/tor.2/torrc @@ -7,6 +7,8 @@ DataDirectory ./data/tor.2 PidFile ./data/tor.2/tor.pid CookieAuthentication 1 FetchUselessDescriptors 1 +# Workaround for Tor #24110, tracked in TorFlow #24094 +UseMicrodescriptors 0 __LeaveStreamsUnattached 1 # Bad idea? Too much consensus update activity?