Commit 7220f49e authored by Matt Traudt's avatar Matt Traudt
Browse files

Revert "[broken] Switch to HTTPTunnelPort from SocksPort" 

This reverts commit c6e398f8.
parent 07d23ef9

sbws/config.default.ini

+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ control_location = 9051 
#control_location = /var/run/tor/control

# Where to connect to Tor for proxying our measurement connections and

# reachability tests

http_proxy_host = 127.0.0.1

http_proxy_port = 3128

socks_host = 127.0.0.1

socks_port = 9050



[cleanup]

# After this many days, compress data files

sbws/util/config.py

+2 −2
Original line number Diff line number Diff line
@@ -184,10 +184,10 @@ def _validate_tor(conf): 
        'control_type': {'valid': ['port', 'socket']},

    }

    hosts = {

        'http_proxy_host': {},

        'socks_host': {},

    }

    ports = {

        'http_proxy_port': {},

        'socks_port': {},

    }

    unvalidated_keys = ['control_location']

    all_valid_keys = list(enums.keys()) + list(hosts.keys()) + \