X-Git-Url: https://git.librecmc.org/?p=oweals%2Ftinc.git;a=blobdiff_plain;f=doc%2Ftinc.texi;h=3decca056477766d4d66e03ff35243450ddd573c;hp=d7776826f9d0fdb93df8f5427ddbed48dc87a655;hb=b58d95eb29662bce4388f95dbc5762b9e2999806;hpb=84531fb6e621959e06519fdbb7f2a8f7578f66bd

diff --git a/doc/tinc.texi b/doc/tinc.texi
index d777682..3decca0 100644
--- a/doc/tinc.texi
+++ b/doc/tinc.texi
@@ -1050,6 +1050,25 @@ specified in the configuration file.
 When this option is used the priority of the tincd process will be adjusted.
 Increasing the priority may help to reduce latency and packet loss on the VPN.
 
+@cindex Proxy
+@item Proxy = <@var{type}> <@var{address}> <@var{port}> [<@var{username}>] [experimental]
+Use the proxy at the given @var{address} and @var{port} when making outgoing connections.
+The following proxy types are currently supported:
+
+@table @asis
+@cindex socks4
+@item socks4
+Connects to the proxy using the SOCKS version 4 protocol.
+Optionally, a @var{username} can be supplied which will be passed on to the proxy server.
+
+@cindex http
+@item http
+Connects to the proxy and sends a HTTP CONNECT request.
+@end table
+
+No authentication methods are currently supported.
+
+
 @cindex ReplayWindow
 @item ReplayWindow = <bytes> (16)
 This is the size of the replay tracking window for each remote node, in bytes.