summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2011-11-30 14:54:33 -0500
committerNick Mathewson <nickm@torproject.org>2011-11-30 14:54:33 -0500
commitd04f21bf394eb9e1781a89d9827476e13cc11086 (patch)
treede78da1483e0421c73bc9efad042eccd627f572d /doc
parent3b88b638264011158d27d5b451fd07d16f60e16b (diff)
parentdb648fe886fd8ae4f42bb13d0219ca7fa690bdc1 (diff)
downloadtor-d04f21bf394eb9e1781a89d9827476e13cc11086.tar.gz
tor-d04f21bf394eb9e1781a89d9827476e13cc11086.zip
Merge branch 'feature2553-v4-rebased'
Diffstat (limited to 'doc')
-rw-r--r--doc/tor.1.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index 4c65334187..56621315ea 100644
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -1016,6 +1016,13 @@ The following options are useful only for clients (that is, if
Tor will look at the UseOptimisticData parameter in the networkstatus.
(Default: auto)
+**Tor2webMode** **0**|**1**::
+ When this option is set, Tor connects to hidden services
+ **non-anonymously**. This option also disables client connections to
+ non-hidden-service hostnames through Tor. It **must only** be used when
+ running a tor2web Hidden Service web proxy.
+ To enable this option the compile time flag --enable-tor2webmode must be
+ specified. (Default: 0)
SERVER OPTIONS
--------------