Skip to content

Commit

Permalink
doc: remove any mention of SOCKS4
Browse files Browse the repository at this point in the history
SOCKS4 support was removed in 0127a9b, as well as the `-socks=` option.
  • Loading branch information
laanwj committed Jul 24, 2014
1 parent 7bf8ab9 commit 59abcef
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 11 deletions.
2 changes: 1 addition & 1 deletion contrib/debian/examples/bitcoin.conf
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
# Run a regression test network
#regtest=0

# Connect via a socks4 proxy
# Connect via a SOCKS5 proxy
#proxy=127.0.0.1:9050

##############################################################
Expand Down
5 changes: 1 addition & 4 deletions contrib/debian/manpages/bitcoin-qt.1
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,7 @@ Set database cache size in megabytes (default: 25)
Specify connection timeout in milliseconds (default: 5000)
.TP
\fB\-proxy=\fR<ip:port>
Connect through socks proxy
.TP
\fB\-socks=\fR<n>
Select the version of socks proxy to use (4\-5, default: 5)
Connect through SOCKS5 proxy
.TP
\fB\-tor=\fR<ip:port>
Use proxy to reach tor hidden services (default: same as \fB\-proxy\fR)
Expand Down
2 changes: 1 addition & 1 deletion contrib/debian/manpages/bitcoind.1
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ Start minimized
Specify data directory
.TP
\fB\-proxy=\fR<ip:port>
Connect through socks4 proxy
Connect through SOCKS5 proxy
.TP
\fB\-addnode=\fR<ip>
Add a node to connect to
Expand Down
5 changes: 0 additions & 5 deletions doc/tor.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@ configure Tor.
The first step is running Bitcoin behind a Tor proxy. This will already make all
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
server will be used to try to reach .onion addresses as well.

Expand Down

0 comments on commit 59abcef

Please sign in to comment.