Skip to content

Commit 59abcef

Browse files
committed
doc: remove any mention of SOCKS4
SOCKS4 support was removed in 0127a9b, as well as the `-socks=` option.
1 parent 7bf8ab9 commit 59abcef

File tree

4 files changed

+3
-11
lines changed

4 files changed

+3
-11
lines changed

contrib/debian/examples/bitcoin.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# Run a regression test network
1111
#regtest=0
1212

13-
# Connect via a socks4 proxy
13+
# Connect via a SOCKS5 proxy
1414
#proxy=127.0.0.1:9050
1515

1616
##############################################################

contrib/debian/manpages/bitcoin-qt.1

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,7 @@ Set database cache size in megabytes (default: 25)
3232
Specify connection timeout in milliseconds (default: 5000)
3333
.TP
3434
\fB\-proxy=\fR<ip:port>
35-
Connect through socks proxy
36-
.TP
37-
\fB\-socks=\fR<n>
38-
Select the version of socks proxy to use (4\-5, default: 5)
35+
Connect through SOCKS5 proxy
3936
.TP
4037
\fB\-tor=\fR<ip:port>
4138
Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR)

contrib/debian/manpages/bitcoind.1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Start minimized
2828
Specify data directory
2929
.TP
3030
\fB\-proxy=\fR<ip:port>
31-
Connect through socks4 proxy
31+
Connect through SOCKS5 proxy
3232
.TP
3333
\fB\-addnode=\fR<ip>
3434
Add a node to connect to

doc/tor.md

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ configure Tor.
1313
The first step is running Bitcoin behind a Tor proxy. This will already make all
1414
outgoing connections be anonymized, but more is possible.
1515

16-
-socks=5 SOCKS5 supports connecting-to-hostname, which can be used instead
17-
of doing a (leaking) local DNS lookup. SOCKS5 is the default,
18-
but SOCKS4 does not support this. (SOCKS4a does, but isn't
19-
implemented).
20-
2116
-proxy=ip:port Set the proxy server. If SOCKS5 is selected (default), this proxy
2217
server will be used to try to reach .onion addresses as well.
2318

0 commit comments

Comments
 (0)