Add Tor2webMode configuration option

diff --git a/doc/tor.1.txt b/doc/tor.1.txt
index f5be391052f699f8c69b2200ca65f67396ba42b6..22c8e88062ca1d6a8944e92f45d1d887c8ec619e 100644 (file)
--- a/doc/tor.1.txt
+++ b/doc/tor.1.txt
@@ -957,6 +957,10 @@ 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.  (Default: 0)
 
 SERVER OPTIONS
 --------------

diff --git a/src/or/config.c b/src/or/config.c
index 06d7d5c022d3917af0638e20686c3f7e9c24138d..b2de15e7f0764d1432078de74ac4037693d2a7c8 100644 (file)
--- a/src/or/config.c
+++ b/src/or/config.c
@@ -394,6 +394,7 @@ static config_var_t _option_vars[] = {
   V(TestSocks,                   BOOL,     "0"),
   OBSOLETE("TestVia"),
   V(TokenBucketRefillInterval,   MSEC_INTERVAL, "100 msec"),
+  V(Tor2webMode,                 BOOL,     "0"),
   V(TrackHostExits,              CSV,      NULL),
   V(TrackHostExitsExpire,        INTERVAL, "30 minutes"),
   OBSOLETE("TrafficShaping"),

diff --git a/src/or/or.h b/src/or/or.h
index 67ba62bdd6602d8f37560df6207f3fcc63c84bed..8515db6673517fa9774cd81e1e4d517154f04237 100644 (file)
--- a/src/or/or.h
+++ b/src/or/or.h
@@ -3008,6 +3008,11 @@ typedef struct {
   int AllDirActionsPrivate; /**< Should every directory action be sent
                              * through a Tor circuit? */
 
+  /** Run in 'tor2web mode'? (I.e. only make client connections to hidden
+   * services, and use a single hop for all hidden-service-related
+   * circuits.) */
+  int Tor2webMode;
+
   int ConnLimit; /**< Demanded minimum number of simultaneous connections. */
   int _ConnLimit; /**< Maximum allowed number of simultaneous connections. */
   int RunAsDaemon; /**< If true, run in the background. (Unix only) */