diff options
| author | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:54:33 -0500 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2011-11-30 14:54:33 -0500 |
| commit | d04f21bf394eb9e1781a89d9827476e13cc11086 (patch) | |
| tree | de78da1483e0421c73bc9efad042eccd627f572d /src/or/or.h | |
| parent | 3b88b638264011158d27d5b451fd07d16f60e16b (diff) | |
| parent | db648fe886fd8ae4f42bb13d0219ca7fa690bdc1 (diff) | |
| download | tor-d04f21bf394eb9e1781a89d9827476e13cc11086.tar.gz tor-d04f21bf394eb9e1781a89d9827476e13cc11086.zip | |
Merge branch 'feature2553-v4-rebased'
Diffstat (limited to 'src/or/or.h')
| -rw-r--r-- | src/or/or.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/or/or.h b/src/or/or.h index 46fead4058..eb9f060e50 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -130,6 +130,10 @@ #define cell_t tor_cell_t #endif +#ifdef ENABLE_TOR2WEB_MODE +#define NON_ANONYMOUS_MODE_ENABLED 1 +#endif + /** Length of longest allowable configured nickname. */ #define MAX_NICKNAME_LEN 19 /** Length of a router identity encoded as a hexadecimal digest, plus @@ -3043,6 +3047,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) */ |