Browse Source

doc: remove any mention of SOCKS4

SOCKS4 support was removed in 0127a9b, as well as the `-socks=` option.
0.10
Wladimir J. van der Laan 10 years ago
parent
commit
59abcefc2e
No known key found for this signature in database
GPG Key ID: 74810B012346C9A6
  1. 2
      contrib/debian/examples/bitcoin.conf
  2. 5
      contrib/debian/manpages/bitcoin-qt.1
  3. 2
      contrib/debian/manpages/bitcoind.1
  4. 5
      doc/tor.md

2
contrib/debian/examples/bitcoin.conf vendored

@ -10,7 +10,7 @@
# Run a regression test network # Run a regression test network
#regtest=0 #regtest=0
# Connect via a socks4 proxy # Connect via a SOCKS5 proxy
#proxy=127.0.0.1:9050 #proxy=127.0.0.1:9050
############################################################## ##############################################################

5
contrib/debian/manpages/bitcoin-qt.1 vendored

@ -32,10 +32,7 @@ Set database cache size in megabytes (default: 25)
Specify connection timeout in milliseconds (default: 5000) Specify connection timeout in milliseconds (default: 5000)
.TP .TP
\fB\-proxy=\fR<ip:port> \fB\-proxy=\fR<ip:port>
Connect through socks proxy Connect through SOCKS5 proxy
.TP
\fB\-socks=\fR<n>
Select the version of socks proxy to use (4\-5, default: 5)
.TP .TP
\fB\-tor=\fR<ip:port> \fB\-tor=\fR<ip:port>
Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR) Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR)

2
contrib/debian/manpages/bitcoind.1 vendored

@ -28,7 +28,7 @@ Start minimized
Specify data directory Specify data directory
.TP .TP
\fB\-proxy=\fR<ip:port> \fB\-proxy=\fR<ip:port>
Connect through socks4 proxy Connect through SOCKS5 proxy
.TP .TP
\fB\-addnode=\fR<ip> \fB\-addnode=\fR<ip>
Add a node to connect to Add a node to connect to

5
doc/tor.md

@ -13,11 +13,6 @@ configure Tor.
The first step is running Bitcoin behind a Tor proxy. This will already make all The first step is running Bitcoin behind a Tor proxy. This will already make all
outgoing connections be anonymized, but more is possible. outgoing connections be anonymized, but more is possible.
-socks=5 SOCKS5 supports connecting-to-hostname, which can be used instead
of doing a (leaking) local DNS lookup. SOCKS5 is the default,
but SOCKS4 does not support this. (SOCKS4a does, but isn't
implemented).
-proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy -proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy
server will be used to try to reach .onion addresses as well. server will be used to try to reach .onion addresses as well.

Loading…
Cancel
Save