diff options
| author | potato <mail@crazypotato.tk> | 2016-09-06 11:47:34 +0200 |
|---|---|---|
| committer | potato <mail@crazypotato.tk> | 2016-09-06 11:47:34 +0200 |
| commit | 9d08c81f47325ceea6d6ae1bda594fc8b8ee7764 (patch) | |
| tree | d7dba53107567f08c89ad12f24d5a10f986f5643 /searx/settings.yml | |
| parent | f4525880ed5f965ac4c241638933842a27a2acf7 (diff) | |
| parent | 55abf07a4f80f74fbcfbeddaee4f8591216802cd (diff) | |
| download | searxng-9d08c81f47325ceea6d6ae1bda594fc8b8ee7764.tar.gz searxng-9d08c81f47325ceea6d6ae1bda594fc8b8ee7764.zip | |
Merge branch 'master' of https://github.com/asciimoo/searx
Diffstat (limited to 'searx/settings.yml')
| -rw-r--r-- | searx/settings.yml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/searx/settings.yml b/searx/settings.yml index b998e0c0d..8c552eb02 100644 --- a/searx/settings.yml +++ b/searx/settings.yml @@ -25,7 +25,7 @@ outgoing: # communication with search engines pool_maxsize : 10 # Number of simultaneous requests by host # uncomment below section if you want to use a proxy # see http://docs.python-requests.org/en/latest/user/advanced/#proxies -# SOCKS proxies are not supported : see https://github.com/kennethreitz/requests/pull/478 +# SOCKS proxies are also supported: see http://docs.python-requests.org/en/master/user/advanced/#socks # proxies : # http : http://127.0.0.1:8080 # https: http://127.0.0.1:8080 |