- tor-commits - lists.torproject.org

[torbrowser/maint-2.2] remove spurious running processes check from linux tbbs. they are no longer needed since we have autoport configuration now.
by erinn＠torproject.org 29 Aug '11

29 Aug '11

commit cb7e4e5f01d2050696efd7687307c5dbb129e4c0 Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 29 23:42:15 2011 +0100 remove spurious running processes check from linux tbbs. they are no longer needed since we have autoport configuration now. --- src/RelativeLink/RelativeLink.sh | 49 ++++++------------------------------- 1 files changed, 8 insertions(+), 41 deletions(-) diff --git a/src/RelativeLink/RelativeLink.sh b/src/RelativeLink/RelativeLink.sh index 1d2f4e3..579612c 100755 --- a/src/RelativeLink/RelativeLink.sh +++ b/src/RelativeLink/RelativeLink.sh @@ -173,48 +173,15 @@ export LD_LIBRARY_PATH DYLD_PRINT_LIBRARIES=1 export DYLD_PRINT_LIBRARIES -# if any relevant processes are running, inform the user and exit cleanly -RUNNING=0 -RUNNING_MESSAGE="" -for process in tor vidalia - # FIXME pidof isn't POSIX - do pid="`pidof $process`" - if [ -n "$pid" ]; then - RUNNING_MESSAGE="`printf "%s\n%s is already running as PID %s." "$RUNNING_MESSAGE" "$process" "$pid"`" - RUNNING=1 - fi - done - -if [ "$RUNNING" -eq 1 ]; then - complain "`printf "%s\n\nPlease shut down the above process(es) before running Tor Browser Bundle." "$RUNNING_MESSAGE"`" - exit 1 -fi - - if [ "${debug}" ]; then - if [ -n "${surveysays}" ]; then - printf "\nSurvey says: $surveysays\n\n" - fi - - # this is likely unportable to Mac OS X or other netstat binaries - for port in "8118" "9050" - do - BOUND="`netstat -tan 2>&1|grep 127.0.0.1":${port}[^:]"|grep -v TIME_WAIT`" - if [ "${BOUND}" ]; then - printf "\nLikely problem detected: It appears that you have something listening on ${port}\n" - printf "\nWe think this because of the following:\n${BOUND}\n" - fi - done - - printf "\nStarting Vidalia now\n" - cd "${HOME}" - printf "\nLaunching Vidalia from: `pwd`\n" - # XXX Someday we should pass whatever command-line arguments we got - # (probably filenames or URLs) to Firefox. - ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ - --datadir Data/Vidalia/ - printf "\nVidalia exited with the following return code: $?\n" - exit + printf "\nStarting Vidalia now\n" + cd "${HOME}" + printf "\nLaunching Vidalia from: `pwd`\n" + # XXX Someday we should pass whatever command-line arguments we got + # (probably filenames or URLs) to Firefox. + ./App/vidalia --loglevel debug --logfile vidalia-debug-log \ + --datadir Data/Vidalia/ + printf "\nVidalia exited with the following return code: $?\n" fi # not in debug mode, run proceed normally

1 0

[torbrowser/maint-2.2] add autoport configuration to linux config files
by erinn＠torproject.org 29 Aug '11

29 Aug '11

commit f6288fccc8c0275f75d16d2afc5ca5437b6f01ff Author: Erinn Clark <erinn(a)torproject.org> Date: Mon Aug 29 23:41:51 2011 +0100 add autoport configuration to linux config files --- build-scripts/config/torrc-linux | 3 ++- build-scripts/config/vidalia.conf.ff-linux | 2 ++ 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/build-scripts/config/torrc-linux b/build-scripts/config/torrc-linux index 9c6cecd..05f5345 100644 --- a/build-scripts/config/torrc-linux +++ b/build-scripts/config/torrc-linux @@ -8,5 +8,6 @@ GeoIPFile ./Data/Tor/geoip Log notice stdout # Bind to this address to listen to connections from SOCKS-speaking # applications. -SocksPort 9050 +SocksPort auto SocksListenAddress 127.0.0.1 +ControlPort auto diff --git a/build-scripts/config/vidalia.conf.ff-linux b/build-scripts/config/vidalia.conf.ff-linux index 94c5503..4535b7b 100644 --- a/build-scripts/config/vidalia.conf.ff-linux +++ b/build-scripts/config/vidalia.conf.ff-linux @@ -8,3 +8,5 @@ LanguageCode=en ControlPort=9051 TorExecutable=./App/tor Torrc=./Data/Tor/torrc +AutoControl=true +DataDirectory=./Data/Tor

1 0

r24982: {website} at least fix the typos on this broken page (website/trunk/download/en)
by Roger Dingledine 29 Aug '11

29 Aug '11

Author: arma Date: 2011-08-29 22:40:10 +0000 (Mon, 29 Aug 2011) New Revision: 24982 Modified: website/trunk/download/en/thankyou.wml Log: at least fix the typos on this broken page Modified: website/trunk/download/en/thankyou.wml =================================================================== --- website/trunk/download/en/thankyou.wml 2011-08-29 22:28:35 UTC (rev 24981) +++ website/trunk/download/en/thankyou.wml 2011-08-29 22:40:10 UTC (rev 24982) @@ -10,18 +10,8 @@ </div> <h1>Thank you for downloading Tor!</h1> - Your download should begin automatically in a few seconds, but if not,you can download with our <a href="#">direct link</a>. - <div id="maincol-left"> - <div class="focus clearfix"> - <h2>Installation Instructions for Mac OS X</h2> - <div class="fakeol">1. </div> - <div class="instructions">Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed lorem velit, faucibus non suscipit sit amet, iaculis sed lorem. Morbi nec nulla id felis dictum porta ut a lacus. Nunc vel est ut nisl tincidunt fermentum nec nec quam. In hac habitasse platea dictumst. Aliquam sagittis bibendum rhoncus.</div> - <div class="fakeol">2. </div> - <div class="instructions">Quisque tincidunt neque condimentum mauris suscipit posuere. Nullam ac nisl metus. Nunc vel est ut nisl tincidunt fermentum nec nec quam. In hac habitasse platea dictumst. Aliquam sagittis bibendum rhoncus.</div> - <div class="fakeol">3. </div> - <div class="instructions">Aliquam sagittis bibendum rhoncus. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Sed lorem velit, faucibus non suscipit sit amet, iaculis sed lorem. Morbi nec nulla id felis dictum porta ut a lacus. Cras egestas lorem vitae arcu ullamcorper ut porttitor metus suscipit.</div> - <a href="<page docs/tor-doc-osx>">Read the full instructions »</a> - </div> + Your download should begin automatically in a few seconds, but if not, you can download with our <a href="#">direct link</a>. + <div id="maincol-left"> <div class="toptwenty"> <div class="img-shadow"> <div class="sidenav-sub"> @@ -30,7 +20,7 @@ <li class="dropdown"><a href="<page docs/installguide>">Read the Installation Guide</a></li> <li class="dropdown"><a href="<page docs/faq>">Check out the FAQ</a></li> <li class="dropdown"><a href="http://wiki.torproject.org">Read the Tor Wiki</a></li> - <li class="dropdown"><a href="#">Email our Techincal Support</a></li> + <li class="dropdown"><a href="#">Email our Technical Support</a></li> </ul> </div> </div>

1 0

r24981: {website} dev version is now 0.2.3.2-alpha, also fix stable manpage (in website/trunk: . docs/en)
by Sebastian Hahn 29 Aug '11

29 Aug '11

Author: sebastian Date: 2011-08-29 22:28:35 +0000 (Mon, 29 Aug 2011) New Revision: 24981 Modified: website/trunk/Makefile website/trunk/docs/en/tor-manual.wml Log: dev version is now 0.2.3.2-alpha, also fix stable manpage Modified: website/trunk/Makefile =================================================================== --- website/trunk/Makefile 2011-08-29 22:17:05 UTC (rev 24980) +++ website/trunk/Makefile 2011-08-29 22:28:35 UTC (rev 24981) @@ -12,7 +12,7 @@ export TORGIT=/home/runa/tordev/tor/.git export STABLETAG=tor-0.2.2.32 -export DEVTAG=tor-0.2.2.32 +export DEVTAG=tor-0.2.3.2-alpha WMLBASE=. SUBDIRS=docs eff projects press about download getinvolved donate torbutton Modified: website/trunk/docs/en/tor-manual.wml =================================================================== --- website/trunk/docs/en/tor-manual.wml 2011-08-29 22:17:05 UTC (rev 24980) +++ website/trunk/docs/en/tor-manual.wml 2011-08-29 22:28:35 UTC (rev 24981) @@ -9,2321 +9,22 @@ <div id="breadcrumbs"> <a href="<page index>">Home » </a> <a href="<page docs/documentation>">Documentation » </a> - <a href="<page docs/tor-doc-osx>">Tor Manual</a> + <a href="<page docs/tor-doc-osx>">Tor Dev Manual</a> </div> - <div id="maincol"> - <h2 id="_synopsis">SYNOPSIS</h2> - <div class="sectionbody"> - <div class="paragraph">tor [OPTION value]… - </div> - </div> - <h2 id="_description">DESCRIPTION</h2> - <div class="sectionbody"> - <div class="paragraph">tor is a connection-oriented anonymizing communication - service. Users choose a source-routed path through a set of nodes, and - negotiate a "virtual circuit" through the network, in which each node - knows its predecessor and successor, but no others. Traffic flowing down - the circuit is unwrapped by a symmetric key at each node, which reveals - the downstream node. </div> - - <div class="paragraph">Basically tor provides a distributed network of servers ("onion routers"). - Users bounce their TCP streams — web traffic, ftp, ssh, etc — around the - routers, and recipients, observers, and even the routers themselves have - difficulty tracking the source of the stream.</div> - </div> - <h2 id="_options">OPTIONS</h2> - <div class="sectionbody"> - <div class="dlist"><dl> - <dt class="hdlist1"> - -h, -help - </dt> - <dd> - - Display a short help message and exit. - - </dd> - <dt class="hdlist1"> - -f FILE - </dt> - <dd> - - FILE contains further "option value" pairs. (Default: @CONFDIR@/torrc) - - </dd> - <dt class="hdlist1"> - --hash-password - </dt> - <dd> - - Generates a hashed password for control port access. - - </dd> - <dt class="hdlist1"> - --list-fingerprint - </dt> - <dd> - - Generate your keys and output your nickname and fingerprint. - - </dd> - <dt class="hdlist1"> - --verify-config - </dt> - <dd> - - Verify the configuration file is valid. - - </dd> - <dt class="hdlist1"> - --nt-service - </dt> - <dd> - - --service [install|remove|start|stop] Manage the Tor Windows - NT/2000/XP service. Current instructions can be found at - <a href="<wiki>doc/TorFAQ#WinNTService">https://trac.torproject.org/projects/tor/wiki/doc/TorFAQ#WinNTService</a> - - </dd> - <dt class="hdlist1"> - --list-torrc-options - </dt> - <dd> - - List all valid options. - - </dd> - <dt class="hdlist1"> - --version - </dt> - <dd> - - Display Tor version and exit. - - </dd> - <dt class="hdlist1"> - --quiet - </dt> - <dd> - - Do not start Tor with a console log unless explicitly requested to do so. - (By default, Tor starts out logging messages at level "notice" or higher to - the console, until it has parsed its configuration.) - - </dd> - </dl> - </div> - <div class="paragraph"> - Other options can be specified either on the command-line (--option - value), or in the configuration file (option value or option "value"). - Options are case-insensitive. C-style escaped characters are allowed inside - quoted values. Options on the command line take precedence over - options found in the configuration file, except indicated otherwise. To - split one configuration entry into multiple lines, use a single \ before - the end of the line. Comments can be used in such multiline entries, but - they must start at the beginning of a line. - </div> - <div class="dlist"><dl> - <dt class="hdlist1"> - BandwidthRate N bytes|KB|MB|GB - </dt> - <dd> - - A token bucket limits the average incoming bandwidth usage on this node to - the specified number of bytes per second, and the average outgoing - bandwidth usage to that same value. If you want to run a relay in the - public network, this needs to be at the very least 20 KB (that is, - 20480 bytes). (Default: 5 MB) - - </dd> - <dt class="hdlist1"> - BandwidthBurst N bytes|KB|MB|GB - </dt> - <dd> - - Limit the maximum token bucket size (also known as the burst) to the given - number of bytes in each direction. (Default: 10 MB) - - </dd> - <dt class="hdlist1"> - MaxAdvertisedBandwidth N bytes|KB|MB|GB - </dt> - <dd> - - If set, we will not advertise more than this amount of bandwidth for our - BandwidthRate. Server operators who want to reduce the number of clients - who ask to build circuits through them (since this is proportional to - advertised bandwidth rate) can thus reduce the CPU demands on their server - without impacting network performance. - - </dd> - <dt class="hdlist1"> - RelayBandwidthRate N bytes|KB|MB|GB - </dt> - <dd> - - If not 0, a separate token bucket limits the average incoming bandwidth - usage for _relayed traffic_ on this node to the specified number of bytes - per second, and the average outgoing bandwidth usage to that same value. - Relayed traffic currently is calculated to include answers to directory - requests, but that may change in future versions. (Default: 0) - - </dd> - <dt class="hdlist1"> - RelayBandwidthBurst N bytes|KB|MB|GB - </dt> - <dd> - - If not 0, limit the maximum token bucket size (also known as the burst) for - _relayed traffic_ to the given number of bytes in each direction. - (Default: 0) - - </dd> - <dt class="hdlist1"> - ConnLimit NUM - </dt> - <dd> - - The minimum number of file descriptors that must be available to the Tor - process before it will start. Tor will ask the OS for as many file - descriptors as the OS will allow (you can find this by "ulimit -H -n"). - If this number is less than ConnLimit, then Tor will refuse to start. - - You probably don’t need to adjust this. It has no effect on Windows - since that platform lacks getrlimit(). (Default: 1000) - - </dd> - <dt class="hdlist1"> - ConstrainedSockets 0|1 - </dt> - <dd> - - If set, Tor will tell the kernel to attempt to shrink the buffers for all - sockets to the size specified in ConstrainedSockSize. This is useful for - virtual servers and other environments where system level TCP buffers may - be limited. If you’re on a virtual server, and you encounter the "Error - creating network socket: No buffer space available" message, you are - likely experiencing this problem. - - The preferred solution is to have the admin increase the buffer pool for - the host itself via /proc/sys/net/ipv4/tcp_mem or equivalent facility; - this configuration option is a second-resort. - - The DirPort option should also not be used if TCP buffers are scarce. The - cached directory requests consume additional sockets which exacerbates - the problem. - - You should not enable this feature unless you encounter the "no buffer - space available" issue. Reducing the TCP buffers affects window size for - the TCP stream and will reduce throughput in proportion to round trip - time on long paths. (Default: 0.) - - </dd> - <dt class="hdlist1"> - ConstrainedSockSize N bytes|KB - </dt> - <dd> - - When ConstrainedSockets is enabled the receive and transmit buffers for - all sockets will be set to this limit. Must be a value between 2048 and - 262144, in 1024 byte increments. Default of 8192 is recommended. - - </dd> - <dt class="hdlist1"> - ControlPort Port - </dt> - <dd> - - If set, Tor will accept connections on this port and allow those - connections to control the Tor process using the Tor Control Protocol - (described in control-spec.txt). Note: unless you also specify one of - HashedControlPassword or CookieAuthentication, setting this option will - cause Tor to allow any process on the local host to control it. This - option is required for many Tor controllers; most use the value of 9051. - - </dd> - <dt class="hdlist1"> - ControlListenAddress IP[:PORT] - </dt> - <dd> - - Bind the controller listener to this address. If you specify a port, bind - to this port rather than the one specified in ControlPort. We strongly - recommend that you leave this alone unless you know what you’re doing, - since giving attackers access to your control listener is really - dangerous. (Default: 127.0.0.1) This directive can be specified multiple - times to bind to multiple addresses/ports. - - </dd> - <dt class="hdlist1"> - ControlSocket Path - </dt> - <dd> - - Like ControlPort, but listens on a Unix domain socket, rather than a TCP - socket. (Unix and Unix-like systems only.) - - </dd> - <dt class="hdlist1"> - HashedControlPassword hashed_password - </dt> - <dd> - - Don’t allow any connections on the control port except when the other - process knows the password whose one-way hash is hashed_password. You - can compute the hash of a password by running "tor --hash-password - password". You can provide several acceptable passwords by using more - than one HashedControlPassword line. - - </dd> - <dt class="hdlist1"> - CookieAuthentication 0|1 - </dt> - <dd> - - If this option is set to 1, don’t allow any connections on the control port - except when the connecting process knows the contents of a file named - "control_auth_cookie", which Tor will create in its data directory. This - authentication method should only be used on systems with good filesystem - security. (Default: 0) - - </dd> - <dt class="hdlist1"> - CookieAuthFile Path - </dt> - <dd> - - If set, this option overrides the default location and file name - for Tor’s cookie file. (See CookieAuthentication above.) - - </dd> - <dt class="hdlist1"> -CookieAuthFileGroupReadable 0|1|Groupname -</dt> -<dd> - - If this option is set to 0, don’t allow the filesystem group to read the - cookie file. If the option is set to 1, make the cookie file readable by - the default GID. [Making the file readable by other groups is not yet - implemented; let us know if you need this for some reason.] (Default: 0). - -</dd> -<dt class="hdlist1"> -DataDirectory DIR -</dt> -<dd> - - Store working data in DIR (Default: @LOCALSTATEDIR@/lib/tor) - -</dd> -<dt class="hdlist1"> -DirServer [nickname] [flags] address:port fingerprint -</dt> -<dd> - - Use a nonstandard authoritative directory server at the provided address - and port, with the specified key fingerprint. This option can be repeated - many times, for multiple authoritative directory servers. Flags are - separated by spaces, and determine what kind of an authority this directory - is. By default, every authority is authoritative for current ("v2")-style - directories, unless the "no-v2" flag is given. If the "v1" flags is - provided, Tor will use this server as an authority for old-style (v1) - directories as well. (Only directory mirrors care about this.) Tor will - use this server as an authority for hidden service information if the "hs" - flag is set, or if the "v1" flag is set and the "no-hs" flag is not set. - Tor will use this authority as a bridge authoritative directory if the - "bridge" flag is set. If a flag "orport=port" is given, Tor will use the - given port when opening encrypted tunnels to the dirserver. Lastly, if a - flag "v3ident=fp" is given, the dirserver is a v3 directory authority - whose v3 long-term signing key has the fingerprint fp. - - If no dirserver line is given, Tor will use the default directory - servers. NOTE: this option is intended for setting up a private Tor - network with its own directory authorities. If you use it, you will be - distinguishable from other users, because you won’t believe the same - authorities they do. - -</dd> -</dl></div> -<div class="paragraph">AlternateDirAuthority [nickname] [flags] address:port fingerprint </div> -<div class="paragraph">AlternateHSAuthority [nickname] [flags] address:port fingerprint </div> -<div class="dlist"><dl> -<dt class="hdlist1"> -AlternateBridgeAuthority [nickname] [flags] address:port fingerprint -</dt> -<dd> - - As DirServer, but replaces less of the default directory authorities. Using - AlternateDirAuthority replaces the default Tor directory authorities, but - leaves the hidden service authorities and bridge authorities in place. - Similarly, Using AlternateHSAuthority replaces the default hidden service - authorities, but not the directory or bridge authorities. - -</dd> -<dt class="hdlist1"> -FetchDirInfoEarly 0|1 -</dt> -<dd> - - If set to 1, Tor will always fetch directory information like other - directory caches, even if you don’t meet the normal criteria for fetching - early. Normal users should leave it off. (Default: 0) - -</dd> -<dt class="hdlist1"> -FetchHidServDescriptors 0|1 -</dt> -<dd> - - If set to 0, Tor will never fetch any hidden service descriptors from the - rendezvous directories. This option is only useful if you’re using a Tor - controller that handles hidden service fetches for you. (Default: 1) - -</dd> -<dt class="hdlist1"> -FetchServerDescriptors 0|1 -</dt> -<dd> - - If set to 0, Tor will never fetch any network status summaries or server - descriptors from the directory servers. This option is only useful if - you’re using a Tor controller that handles directory fetches for you. - (Default: 1) - -</dd> -<dt class="hdlist1"> -FetchUselessDescriptors 0|1 -</dt> -<dd> - - If set to 1, Tor will fetch every non-obsolete descriptor from the - authorities that it hears about. Otherwise, it will avoid fetching useless - descriptors, for example for routers that are not running. This option is - useful if you’re using the contributed "exitlist" script to enumerate Tor - nodes that exit to certain addresses. (Default: 0) - -</dd> -<dt class="hdlist1"> -HTTPProxy host[:port] -</dt> -<dd> - - Tor will make all its directory requests through this host:port (or host:80 - if port is not specified), rather than connecting directly to any directory - servers. - -</dd> -<dt class="hdlist1"> -HTTPProxyAuthenticator username:password -</dt> -<dd> - - If defined, Tor will use this username:password for Basic HTTP proxy - authentication, as in RFC 2617. This is currently the only form of HTTP - proxy authentication that Tor supports; feel free to submit a patch if you - want it to support others. - -</dd> -<dt class="hdlist1"> -HTTPSProxy host[:port] -</dt> -<dd> - - Tor will make all its OR (SSL) connections through this host:port (or - host:443 if port is not specified), via HTTP CONNECT rather than connecting - directly to servers. You may want to set FascistFirewall to restrict - the set of ports you might try to connect to, if your HTTPS proxy only - allows connecting to certain ports. - -</dd> -<dt class="hdlist1"> -HTTPSProxyAuthenticator username:password -</dt> -<dd> - - If defined, Tor will use this username:password for Basic HTTPS proxy - authentication, as in RFC 2617. This is currently the only form of HTTPS - proxy authentication that Tor supports; feel free to submit a patch if you - want it to support others. - -</dd> -<dt class="hdlist1"> -KeepalivePeriod NUM -</dt> -<dd> - - To keep firewalls from expiring connections, send a padding keepalive cell - every NUM seconds on open connections that are in use. If the connection - has no open circuits, it will instead be closed after NUM seconds of - idleness. (Default: 5 minutes) - -</dd> -<dt class="hdlist1"> -Log minSeverity[-maxSeverity] stderr|stdout|syslog -</dt> -<dd> - - Send all messages between minSeverity and maxSeverity to the standard - output stream, the standard error stream, or to the system log. (The - "syslog" value is only supported on Unix.) Recognized severity levels are - debug, info, notice, warn, and err. We advise using "notice" in most cases, - since anything more verbose may provide sensitive information to an - attacker who obtains the logs. If only one severity level is given, all - messages of that level or higher will be sent to the listed destination. - -</dd> -<dt class="hdlist1"> -Log minSeverity[-maxSeverity] file FILENAME -</dt> -<dd> - - As above, but send log messages to the listed filename. The - "Log" option may appear more than once in a configuration file. - Messages are sent to all the logs that match their severity - level. - -</dd> -<dt class="hdlist1"> -OutboundBindAddress IP -</dt> -<dd> - - Make all outbound connections originate from the IP address specified. This - is only useful when you have multiple network interfaces, and you want all - of Tor’s outgoing connections to use a single one. This setting will be - ignored for connections to the loopback addresses (127.0.0.0/8 and ::1). - -</dd> -<dt class="hdlist1"> -PidFile FILE -</dt> -<dd> - - On startup, write our PID to FILE. On clean shutdown, remove - FILE. - -</dd> -<dt class="hdlist1"> -ProtocolWarnings 0|1 -</dt> -<dd> - - If 1, Tor will log with severity 'warn' various cases of other parties not - following the Tor specification. Otherwise, they are logged with severity - 'info'. (Default: 0) - -</dd> -<dt class="hdlist1"> -RunAsDaemon 0|1 -</dt> -<dd> - - If 1, Tor forks and daemonizes to the background. This option has no effect - on Windows; instead you should use the --service command-line option. - (Default: 0) - -</dd> -<dt class="hdlist1"> -SafeLogging 0|1 -</dt> -<dd> - - Tor can scrub potentially sensitive strings from log messages (e.g. - addresses) by replacing them with the string [scrubbed]. This way logs can - still be useful, but they don’t leave behind personally identifying - information about what sites a user might have visited. - - If this option is set to 0, Tor will not perform any scrubbing, if it is - set to 1, all potentially sensitive strings are replaced. (Default: 1) - -</dd> -<dt class="hdlist1"> -User UID -</dt> -<dd> - - On startup, setuid to this user and setgid to their primary group. - -</dd> -<dt class="hdlist1"> -HardwareAccel 0|1 -</dt> -<dd> - - If non-zero, try to use built-in (static) crypto hardware acceleration when - available. This is untested and probably buggy. (Default: 0) - -</dd> -<dt class="hdlist1"> -AvoidDiskWrites 0|1 -</dt> -<dd> - - If non-zero, try to write to disk less frequently than we would otherwise. - This is useful when running on flash memory or other media that support - only a limited number of writes. (Default: 0) - -</dd> -<dt class="hdlist1"> -TunnelDirConns 0|1 -</dt> -<dd> - - If non-zero, when a directory server we contact supports it, we will build - a one-hop circuit and make an encrypted connection via its ORPort. - (Default: 1) - -</dd> -<dt class="hdlist1"> -PreferTunneledDirConns 0|1 -</dt> -<dd> - - If non-zero, we will avoid directory servers that don’t support tunneled - directory connections, when possible. (Default: 1) - -</dd> -</dl></div> -</div> -<h2 id="_client_options">CLIENT OPTIONS</h2> -<div class="sectionbody"> -<div class="paragraph">The following options are useful only for clients (that is, if -SocksPort is non-zero):</div> -<div class="dlist"><dl> -<dt class="hdlist1"> -AllowInvalidNodes entry|exit|middle|introduction|rendezvous|… -</dt> -<dd> - - If some Tor servers are obviously not working right, the directory - authorities can manually mark them as invalid, meaning that it’s not - recommended you use them for entry or exit positions in your circuits. You - can opt to use them in some circuit positions, though. The default is - "middle,rendezvous", and other choices are not advised. - -</dd> -<dt class="hdlist1"> -ExcludeSingleHopRelays 0|1 -</dt> -<dd> - - This option controls whether circuits built by Tor will include relays with - the AllowSingleHopExits flag set to true. If ExcludeSingleHopRelays is set - to 0, these relays will be included. Note that these relays might be at - higher risk of being seized or observed, so they are not normally - included. Also note that relatively few clients turn off this option, - so using these relays might make your client stand out. - (Default: 1) - -</dd> -<dt class="hdlist1"> -Bridge IP:ORPort [fingerprint] -</dt> -<dd> - - When set along with UseBridges, instructs Tor to use the relay at - "IP:ORPort" as a "bridge" relaying into the Tor network. If "fingerprint" - is provided (using the same format as for DirServer), we will verify that - the relay running at that location has the right fingerprint. We also use - fingerprint to look up the bridge descriptor at the bridge authority, if - it’s provided and if UpdateBridgesFromAuthority is set too. - -</dd> -<dt class="hdlist1"> -CircuitBuildTimeout NUM -</dt> -<dd> - - Try for at most NUM seconds when building circuits. If the circuit isn't - open in that time, give up on it. (Default: 1 minute.) - -</dd> -<dt class="hdlist1"> -CircuitIdleTimeout NUM -</dt> -<dd> - - If we have kept a clean (never used) circuit around for NUM seconds, then - close it. This way when the Tor client is entirely idle, it can expire all - of its circuits, and then expire its TLS connections. Also, if we end up - making a circuit that is not useful for exiting any of the requests we’re - receiving, it won’t forever take up a slot in the circuit list. (Default: 1 - hour.) - -</dd> -<dt class="hdlist1"> -ClientOnly 0|1 -</dt> -<dd> - - If set to 1, Tor will under no circumstances run as a server or serve - directory requests. The default is to run as a client unless ORPort is - configured. (Usually, you don’t need to set this; Tor is pretty smart at - figuring out whether you are reliable and high-bandwidth enough to be a - useful server.) (Default: 0) - -</dd> -<dt class="hdlist1"> -ExcludeNodes node,node,… -</dt> -<dd> - - A list of identity fingerprints, nicknames, country codes and address - patterns of nodes to never use when building a circuit. (Example: - ExcludeNodes SlowServer, $ EFFFFFFFFFFFFFFF, {cc}, 255.254.0.0/8) - -</dd> -<dt class="hdlist1"> -ExcludeExitNodes node,node,… -</dt> -<dd> - - A list of identity fingerprints, nicknames, country codes and address - patterns of nodes to never use when picking an exit node. Note that any - node listed in ExcludeNodes is automatically considered to be part of this - list. - -</dd> -<dt class="hdlist1"> -EntryNodes node,node,… -</dt> -<dd> - - A list of identity fingerprints, nicknames and address - patterns of nodes to use for the first hop in normal circuits. These are - treated only as preferences unless StrictNodes (see below) is also set. - -</dd> -<dt class="hdlist1"> -ExitNodes node,node,… -</dt> -<dd> - - A list of identity fingerprints, nicknames, country codes and address - patterns of nodes to use for the last hop in normal exit circuits. These - are treated only as preferences unless StrictNodes (see below) is also set. - -</dd> -<dt class="hdlist1"> -StrictEntryNodes 0|1 -</dt> -<dd> - - If 1, Tor will never use any nodes besides those listed in "EntryNodes" for - the first hop of a circuit. - -</dd> -<dt class="hdlist1"> -StrictExitNodes 0|1 -</dt> -<dd> - - If 1, Tor will never use any nodes besides those listed in "ExitNodes" for - the last hop of a circuit. - -</dd> -<dt class="hdlist1"> -FascistFirewall 0|1 -</dt> -<dd> - - If 1, Tor will only create outgoing connections to ORs running on ports - that your firewall allows (defaults to 80 and 443; see FirewallPorts). - This will allow you to run Tor as a client behind a firewall with - restrictive policies, but will not allow you to run as a server behind such - a firewall. If you prefer more fine-grained control, use - ReachableAddresses instead. - -</dd> -<dt class="hdlist1"> -FirewallPorts PORTS -</dt> -<dd> - - A list of ports that your firewall allows you to connect to. Only used when - FascistFirewall is set. This option is deprecated; use ReachableAddresses - instead. (Default: 80, 443) - -</dd> -<dt class="hdlist1"> -HidServAuth onion-address auth-cookie [service-name] -</dt> -<dd> - - Client authorization for a hidden service. Valid onion addresses contain 16 - characters in a-z2-7 plus ".onion", and valid auth cookies contain 22 - characters in A-Za-z0-9+/. The service name is only used for internal - purposes, e.g., for Tor controllers. This option may be used multiple times - for different hidden services. If a hidden service uses authorization and - this option is not set, the hidden service is not accessible. Hidden - services can be configured to require authorization using the - HiddenServiceAuthorizeClient option. - -</dd> -<dt class="hdlist1"> -ReachableAddresses ADDR[/MASK][:PORT]… -</dt> -<dd> - - A comma-separated list of IP addresses and ports that your firewall allows - you to connect to. The format is as for the addresses in ExitPolicy, except - that "accept" is understood unless "reject" is explicitly provided. For - example, 'ReachableAddresses 99.0.0.0/8, reject 18.0.0.0/8:80, accept - *:80' means that your firewall allows connections to everything inside net - 99, rejects port 80 connections to net 18, and accepts connections to port - 80 otherwise. (Default: 'accept *:*'.) - -</dd> -<dt class="hdlist1"> -ReachableDirAddresses ADDR[/MASK][:PORT]… -</dt> -<dd> - - Like ReachableAddresses, a list of addresses and ports. Tor will obey - these restrictions when fetching directory information, using standard HTTP - GET requests. If not set explicitly then the value of - ReachableAddresses is used. If HTTPProxy is set then these - connections will go through that proxy. - -</dd> -<dt class="hdlist1"> -ReachableORAddresses ADDR[/MASK][:PORT]… -</dt> -<dd> - - Like ReachableAddresses, a list of addresses and ports. Tor will obey - these restrictions when connecting to Onion Routers, using TLS/SSL. If not - set explicitly then the value of ReachableAddresses is used. If - HTTPSProxy is set then these connections will go through that proxy. - - The separation between ReachableORAddresses and - ReachableDirAddresses is only interesting when you are connecting - through proxies (see HTTPProxy and HTTPSProxy). Most proxies limit - TLS connections (which Tor uses to connect to Onion Routers) to port 443, - and some limit HTTP GET requests (which Tor uses for fetching directory - information) to port 80. - -</dd> -<dt class="hdlist1"> -LongLivedPorts PORTS -</dt> -<dd> - - A list of ports for services that tend to have long-running connections - (e.g. chat and interactive shells). Circuits for streams that use these - ports will contain only high-uptime nodes, to reduce the chance that a node - will go down before the stream is finished. (Default: 21, 22, 706, 1863, - 5050, 5190, 5222, 5223, 6667, 6697, 8300) - -</dd> -<dt class="hdlist1"> -MapAddress address newaddress -</dt> -<dd> - - When a request for address arrives to Tor, it will rewrite it to newaddress - before processing it. For example, if you always want connections to - www.indymedia.org to exit via torserver (where torserver is the - nickname of the server), use "MapAddress www.indymedia.org - www.indymedia.org.torserver.exit". - -</dd> -<dt class="hdlist1"> -NewCircuitPeriod NUM -</dt> -<dd> - - Every NUM seconds consider whether to build a new circuit. (Default: 30 - seconds) - -</dd> -<dt class="hdlist1"> -MaxCircuitDirtiness NUM -</dt> -<dd> - - Feel free to reuse a circuit that was first used at most NUM seconds ago, - but never attach a new stream to a circuit that is too old. (Default: 10 - minutes) - -</dd> -<dt class="hdlist1"> -NodeFamily node,node,… -</dt> -<dd> - - The Tor servers, defined by their identity fingerprints or nicknames, - constitute a "family" of similar or co-administered servers, so never use - any two of them in the same circuit. Defining a NodeFamily is only needed - when a server doesn’t list the family itself (with MyFamily). This option - can be used multiple times. - -</dd> -<dt class="hdlist1"> -EnforceDistinctSubnets 0|1 -</dt> -<dd> - - If 1, Tor will not put two servers whose IP addresses are "too close" on - the same circuit. Currently, two addresses are "too close" if they lie in - the same /16 range. (Default: 1) - -</dd> -<dt class="hdlist1"> -SocksPort PORT -</dt> -<dd> - - Advertise this port to listen for connections from Socks-speaking - applications. Set this to 0 if you don’t want to allow application - connections. (Default: 9050) - -</dd> -<dt class="hdlist1"> -SocksListenAddress IP[:PORT] -</dt> -<dd> - - Bind to this address to listen for connections from Socks-speaking - applications. (Default: 127.0.0.1) You can also specify a port (e.g. - 192.168.0.1:9100). This directive can be specified multiple times to bind - to multiple addresses/ports. - -</dd> -<dt class="hdlist1"> -SocksPolicy policy,policy,… -</dt> -<dd> - - Set an entrance policy for this server, to limit who can connect to the - SocksPort and DNSPort ports. The policies have the same form as exit - policies below. - -</dd> -<dt class="hdlist1"> -SocksTimeout NUM -</dt> -<dd> - - Let a socks connection wait NUM seconds handshaking, and NUM seconds - unattached waiting for an appropriate circuit, before we fail it. (Default: - 2 minutes.) - -</dd> -<dt class="hdlist1"> -TrackHostExits host,.domain,… -</dt> -<dd> - - For each value in the comma separated list, Tor will track recent - connections to hosts that match this value and attempt to reuse the same - exit node for each. If the value is prepended with a '.', it is treated as - matching an entire domain. If one of the values is just a '.', it means - match everything. This option is useful if you frequently connect to sites - that will expire all your authentication cookies (i.e. log you out) if - your IP address changes. Note that this option does have the disadvantage - of making it more clear that a given history is associated with a single - user. However, most people who would wish to observe this will observe it - through cookies or other protocol-specific means anyhow. - -</dd> -<dt class="hdlist1"> -TrackHostExitsExpire NUM -</dt> -<dd> - - Since exit servers go up and down, it is desirable to expire the - association between host and exit server after NUM seconds. The default is - 1800 seconds (30 minutes). - -</dd> -<dt class="hdlist1"> -UpdateBridgesFromAuthority 0|1 -</dt> -<dd> - - When set (along with UseBridges), Tor will try to fetch bridge descriptors - from the configured bridge authorities when feasible. It will fall back to - a direct request if the authority responds with a 404. (Default: 0) - -</dd> -<dt class="hdlist1"> -UseBridges 0|1 -</dt> -<dd> - - When set, Tor will fetch descriptors for each bridge listed in the "Bridge" - config lines, and use these relays as both entry guards and directory - guards. (Default: 0) - -</dd> -<dt class="hdlist1"> -UseEntryGuards 0|1 -</dt> -<dd> - - If this option is set to 1, we pick a few long-term entry servers, and try - to stick with them. This is desirable because constantly changing servers - increases the odds that an adversary who owns some servers will observe a - fraction of your paths. (Defaults to 1.) - -</dd> -<dt class="hdlist1"> -NumEntryGuards NUM -</dt> -<dd> - - If UseEntryGuards is set to 1, we will try to pick a total of NUM routers - as long-term entries for our circuits. (Defaults to 3.) - -</dd> -<dt class="hdlist1"> -SafeSocks 0|1 -</dt> -<dd> - - When this option is enabled, Tor will reject application connections that - use unsafe variants of the socks protocol — ones that only provide an IP - address, meaning the application is doing a DNS resolve first. - Specifically, these are socks4 and socks5 when not doing remote DNS. - (Defaults to 0.) - -</dd> -<dt class="hdlist1"> -TestSocks 0|1 -</dt> -<dd> - - When this option is enabled, Tor will make a notice-level log entry for - each connection to the Socks port indicating whether the request used a - safe socks protocol or an unsafe one (see above entry on SafeSocks). This - helps to determine whether an application using Tor is possibly leaking - DNS requests. (Default: 0) - -</dd> -<dt class="hdlist1"> -VirtualAddrNetwork Address/bits -</dt> -<dd> - - When Tor needs to assign a virtual (unused) address because of a MAPADDRESS - command from the controller or the AutomapHostsOnResolve feature, Tor - picks an unassigned address from this range. (Default: - 127.192.0.0/10) - - When providing proxy server service to a network of computers using a tool - like dns-proxy-tor, change this address to "10.192.0.0/10" or - "172.16.0.0/12". The default VirtualAddrNetwork address range on a - properly configured machine will route to the loopback interface. For - local use, no change to the default VirtualAddrNetwork setting is needed. - -</dd> -<dt class="hdlist1"> -AllowNonRFC953Hostnames 0|1 -</dt> -<dd> - - When this option is disabled, Tor blocks hostnames containing illegal - characters (like @ and :) rather than sending them to an exit node to be - resolved. This helps trap accidental attempts to resolve URLs and so on. - (Default: 0) - -</dd> -<dt class="hdlist1"> -FastFirstHopPK 0|1 -</dt> -<dd> - - When this option is disabled, Tor uses the public key step for the first - hop of creating circuits. Skipping it is generally safe since we have - already used TLS to authenticate the relay and to establish forward-secure - keys. Turning this option off makes circuit building slower. - - Note that Tor will always use the public key step for the first hop if it’s - operating as a relay, and it will never use the public key step if it - doesn’t yet know the onion key of the first hop. (Default: 1) - -</dd> -<dt class="hdlist1"> -TransPort PORT -</dt> -<dd> - - If non-zero, enables transparent proxy support on PORT (by convention, - 9040). Requires OS support for transparent proxies, such as BSDs' pf or - Linux’s IPTables. If you’re planning to use Tor as a transparent proxy for - a network, you’ll want to examine and change VirtualAddrNetwork from the - default setting. You’ll also want to set the TransListenAddress option for - the network you’d like to proxy. (Default: 0). - -</dd> -<dt class="hdlist1"> -TransListenAddress IP[:PORT] -</dt> -<dd> - - Bind to this address to listen for transparent proxy connections. (Default: - 127.0.0.1). This is useful for exporting a transparent proxy server to an - entire network. - -</dd> -<dt class="hdlist1"> -NATDPort PORT -</dt> -<dd> - - Allow old versions of ipfw (as included in old versions of FreeBSD, etc.) - to send connections through Tor using the NATD protocol. This option is - only for people who cannot use TransPort. - -</dd> -<dt class="hdlist1"> -NATDListenAddress IP[:PORT] -</dt> -<dd> - - Bind to this address to listen for NATD connections. (Default: 127.0.0.1). - -</dd> -<dt class="hdlist1"> -AutomapHostsOnResolve 0|1 -</dt> -<dd> - - When this option is enabled, and we get a request to resolve an address - that ends with one of the suffixes in AutomapHostsSuffixes, we map an - unused virtual address to that address, and return the new virtual address. - This is handy for making ".onion" addresses work with applications that - resolve an address and then connect to it. (Default: 0). - -</dd> -<dt class="hdlist1"> -AutomapHostsSuffixes SUFFIX,SUFFIX,… -</dt> -<dd> - - A comma-separated list of suffixes to use with AutomapHostsOnResolve. - The "." suffix is equivalent to "all addresses." (Default: .exit,.onion). - -</dd> -<dt class="hdlist1"> -DNSPort PORT -</dt> -<dd> - - If non-zero, Tor listens for UDP DNS requests on this port and resolves - them anonymously. (Default: 0). - -</dd> -<dt class="hdlist1"> -DNSListenAddress IP[:PORT] -</dt> -<dd> - - Bind to this address to listen for DNS connections. (Default: 127.0.0.1). - -</dd> -<dt class="hdlist1"> -ClientDNSRejectInternalAddresses 0|1 -</dt> -<dd> - - If true, Tor does not believe any anonymously retrieved DNS answer that - tells it that an address resolves to an internal address (like 127.0.0.1 or - 192.168.0.1). This option prevents certain browser-based attacks; don’t - turn it off unless you know what you’re doing. (Default: 1). - -</dd> -<dt class="hdlist1"> -DownloadExtraInfo 0|1 -</dt> -<dd> - - If true, Tor downloads and caches "extra-info" documents. These documents - contain information about servers other than the information in their - regular router descriptors. Tor does not use this information for anything - itself; to save bandwidth, leave this option turned off. (Default: 0). - -</dd> -<dt class="hdlist1"> -FallbackNetworkstatusFile FILENAME -</dt> -<dd> - - If Tor doesn’t have a cached networkstatus file, it starts out using this - one instead. Even if this file is out of date, Tor can still use it to - learn about directory mirrors, so it doesn’t need to put load on the - authorities. (Default: None). - -</dd> -<dt class="hdlist1"> -WarnPlaintextPorts port,port,… -</dt> -<dd> - - Tells Tor to issue a warnings whenever the user tries to make an anonymous - connection to one of these ports. This option is designed to alert users - to services that risk sending passwords in the clear. (Default: - 23,109,110,143). - -</dd> -<dt class="hdlist1"> -RejectPlaintextPorts port,port,… -</dt> -<dd> - - Like WarnPlaintextPorts, but instead of warning about risky port uses, Tor - will instead refuse to make the connection. (Default: None). - -</dd> -</dl></div> -</div> -<h2 id="_server_options">SERVER OPTIONS</h2> -<div class="sectionbody"> -<div class="paragraph">The following options are useful only for servers (that is, if ORPort -is non-zero):</div> -<div class="dlist"><dl> -<dt class="hdlist1"> -Address address -</dt> -<dd> - - The IP address or fully qualified domain name of this server (e.g. - moria.mit.edu) You can leave this unset, and Tor will guess your IP - address. - -</dd> -<dt class="hdlist1"> -AllowSingleHopExits 0|1 -</dt> -<dd> - - This option controls whether clients can use this server as a single hop - proxy. If set to 1, clients can use this server as an exit even if it is - the only hop in the circuit. Note that most clients will refuse to use - servers that set this option, since most clients have - ExcludeSingleHopRelays set. (Default: 0) - -</dd> -<dt class="hdlist1"> -AssumeReachable 0|1 -</dt> -<dd> - - This option is used when bootstrapping a new Tor network. If set to 1, - don’t do self-reachability testing; just upload your server descriptor - immediately. If AuthoritativeDirectory is also set, this option - instructs the dirserver to bypass remote reachability testing too and list - all connected servers as running. - -</dd> -<dt class="hdlist1"> -BridgeRelay 0|1 -</dt> -<dd> - - Sets the relay to act as a "bridge" with respect to relaying connections - from bridge users to the Tor network. It mainly causes Tor to publish a - server descriptor to the bridge database, rather than publishing a relay - descriptor to the public directory authorities. - -</dd> -<dt class="hdlist1"> -ContactInfo email_address -</dt> -<dd> - - Administrative contact information for server. This line might get picked - up by spam harvesters, so you may want to obscure the fact that it’s an - email address. - -</dd> -<dt class="hdlist1"> -ExitPolicy policy,policy,… -</dt> -<dd> - - Set an exit policy for this server. Each policy is of the form - "accept|reject ADDR[/MASK][:PORT]". If /MASK is - omitted then this policy just applies to the host given. Instead of giving - a host or network you can also use "*" to denote the universe (0.0.0.0/0). - PORT can be a single port number, an interval of ports - "FROM_PORT-TO_PORT", or "*". If PORT is omitted, that means - "*". - - For example, "accept 18.7.22.69:*,reject 18.0.0.0/8:*,accept *:*" would - reject any traffic destined for MIT except for web.mit.edu, and accept - anything else. - - To specify all internal and link-local networks (including 0.0.0.0/8, - 169.254.0.0/16, 127.0.0.0/8, 192.168.0.0/16, 10.0.0.0/8, and - 172.16.0.0/12), you can use the "private" alias instead of an address. - These addresses are rejected by default (at the beginning of your exit - policy), along with your public IP address, unless you set the - ExitPolicyRejectPrivate config option to 0. For example, once you’ve done - that, you could allow HTTP to 127.0.0.1 and block all other connections to - internal networks with "accept 127.0.0.1:80,reject private:*", though that - may also allow connections to your own computer that are addressed to its - public (external) IP address. See RFC 1918 and RFC 3330 for more details - about internal and reserved IP address space. - - This directive can be specified multiple times so you don’t have to put it - all on one line. - - Policies are considered first to last, and the first match wins. If you - want to _replace_ the default exit policy, end your exit policy with - either a reject *:* or an accept *:*. Otherwise, you’re _augmenting_ - (prepending to) the default exit policy. The default exit policy is: - -<div class="literalblock"> -<div class="content"> -<pre><tt>reject *:25^M -reject *:119^M -reject *:135-139^M -reject *:445^M -reject *:563^M -reject *:1214^M -reject *:4661-4666^M -reject *:6346-6429^M -reject *:6699^M -reject *:6881-6999^M -accept *:*</tt></pre> -</div></div> -</dd> -<dt class="hdlist1"> -ExitPolicyRejectPrivate 0|1 -</dt> -<dd> - - Reject all private (local) networks, along with your own public IP address, - at the beginning of your exit policy. See above entry on ExitPolicy. - (Default: 1) - -</dd> -<dt class="hdlist1"> -MaxOnionsPending NUM -</dt> -<dd> - - If you have more than this number of onionskins queued for decrypt, reject - new ones. (Default: 100) - -</dd> -<dt class="hdlist1"> -MyFamily node,node,… -</dt> -<dd> - - Declare that this Tor server is controlled or administered by a group or - organization identical or similar to that of the other servers, defined by - their identity fingerprints or nicknames. When two servers both declare - that they are in the same 'family', Tor clients will not use them in the - same circuit. (Each server only needs to list the other servers in its - family; it doesn’t need to list itself, but it won’t hurt.) - -</dd> -<dt class="hdlist1"> -Nickname name -</dt> -<dd> - - Set the server’s nickname to 'name'. Nicknames must be between 1 and 19 - characters inclusive, and must contain only the characters [a-zA-Z0-9]. - -</dd> -<dt class="hdlist1"> -NumCPUs num -</dt> -<dd> - - How many processes to use at once for decrypting onionskins. (Default: 1) - -</dd> -<dt class="hdlist1"> -ORPort PORT -</dt> -<dd> - - Advertise this port to listen for connections from Tor clients and servers. - -</dd> -<dt class="hdlist1"> -ORListenAddress IP[:PORT] -</dt> -<dd> - - Bind to this IP address to listen for connections from Tor clients and - servers. If you specify a port, bind to this port rather than the one - specified in ORPort. (Default: 0.0.0.0) This directive can be specified - multiple times to bind to multiple addresses/ports. - -</dd> -<dt class="hdlist1"> -PublishServerDescriptor 0|1|v1|v2|v3|bridge,… -</dt> -<dd> - - This option specifies which descriptors Tor will publish when acting as - a relay. You can - choose multiple arguments, separated by commas. - - If this option is set to 0, Tor will not publish its - descriptors to any directories. (This is useful if you’re testing - out your server, or if you’re using a Tor controller that handles directory - publishing for you.) Otherwise, Tor will publish its descriptors of all - type(s) specified. The default is "1", - which means "if running as a server, publish the - appropriate descriptors to the authorities". - -</dd> -<dt class="hdlist1"> -ShutdownWaitLength NUM -</dt> -<dd> - - When we get a SIGINT and we’re a server, we begin shutting down: - we close listeners and start refusing new circuits. After NUM - seconds, we exit. If we get a second SIGINT, we exit immedi- - ately. (Default: 30 seconds) - -</dd> -<dt class="hdlist1"> -AccountingMax N bytes|KB|MB|GB|TB -</dt> -<dd> - - Never send more than the specified number of bytes in a given accounting - period, or receive more than that number in the period. For example, with - AccountingMax set to 1 GB, a server could send 900 MB and receive 800 MB - and continue running. It will only hibernate once one of the two reaches 1 - GB. When the number of bytes gets low, Tor will stop accepting new - connections and circuits. When the number of bytes - is exhausted, Tor will hibernate until some - time in the next accounting period. To prevent all servers from waking at - the same time, Tor will also wait until a random point in each period - before waking up. If you have bandwidth cost issues, enabling hibernation - is preferable to setting a low bandwidth, since it provides users with a - collection of fast servers that are up some of the time, which is more - useful than a set of slow servers that are always "available". - -</dd> -<dt class="hdlist1"> -AccountingStart day|week|month [day] HH:MM -</dt> -<dd> - - Specify how long accounting periods last. If month is given, each - accounting period runs from the time HH:MM on the dayth day of one - month to the same day and time of the next. (The day must be between 1 and - 28.) If week is given, each accounting period runs from the time HH:MM - of the dayth day of one week to the same day and time of the next week, - with Monday as day 1 and Sunday as day 7. If day is given, each - accounting period runs from the time HH:MM each day to the same time on - the next day. All times are local, and given in 24-hour time. (Defaults to - "month 1 0:00".) - -</dd> -<dt class="hdlist1"> -ServerDNSResolvConfFile filename -</dt> -<dd> - - Overrides the default DNS configuration with the configuration in - filename. The file format is the same as the standard Unix - "resolv.conf" file (7). This option, like all other ServerDNS options, - only affects name lookups that your server does on behalf of clients. - (Defaults to use the system DNS configuration.) - -</dd> -<dt class="hdlist1"> -ServerDNSAllowBrokenConfig 0|1 -</dt> -<dd> - - If this option is false, Tor exits immediately if there are problems - parsing the system DNS configuration or connecting to nameservers. - Otherwise, Tor continues to periodically retry the system nameservers until - it eventually succeeds. (Defaults to "1".) - -</dd> -<dt class="hdlist1"> -ServerDNSSearchDomains 0|1 -</dt> -<dd> - - If set to 1, then we will search for addresses in the local search domain. - For example, if this system is configured to believe it is in - "example.com", and a client tries to connect to "www", the client will be - connected to "www.example.com". This option only affects name lookups that - your server does on behalf of clients. (Defaults to "0".) - -</dd> -<dt class="hdlist1"> -ServerDNSDetectHijacking 0|1 -</dt> -<dd> - - When this option is set to 1, we will test periodically to determine - whether our local nameservers have been configured to hijack failing DNS - requests (usually to an advertising site). If they are, we will attempt to - correct this. This option only affects name lookups that your server does - on behalf of clients. (Defaults to "1".) - -</dd> -<dt class="hdlist1"> -ServerDNSTestAddresses address,address,… -</dt> -<dd> - - When we’re detecting DNS hijacking, make sure that these valid addresses - aren’t getting redirected. If they are, then our DNS is completely useless, - and we’ll reset our exit policy to "reject :". This option only affects - name lookups that your server does on behalf of clients. (Defaults to - "www.google.com, www.mit.edu, www.yahoo.com, www.slashdot.org".) - -</dd> -<dt class="hdlist1"> -ServerDNSAllowNonRFC953Hostnames 0|1 -</dt> -<dd> - - When this option is disabled, Tor does not try to resolve hostnames - containing illegal characters (like @ and :) rather than sending them to an - exit node to be resolved. This helps trap accidental attempts to resolve - URLs and so on. This option only affects name lookups that your server does - on behalf of clients. (Default: 0) - -</dd> -<dt class="hdlist1"> -BridgeRecordUsageByCountry 0|1 -</dt> -<dd> - - When this option is enabled and BridgeRelay is also enabled, and we have - GeoIP data, Tor keeps a keep a per-country count of how many client - addresses have contacted it so that it can help the bridge authority guess - which countries have blocked access to it. (Default: 1) - -</dd> -<dt class="hdlist1"> -ServerDNSRandomizeCase 0|1 -</dt> -<dd> - - When this option is set, Tor sets the case of each character randomly in - outgoing DNS requests, and makes sure that the case matches in DNS replies. - This so-called "0x20 hack" helps resist some types of DNS poisoning attack. - For more information, see "Increased DNS Forgery Resistance through - 0x20-Bit Encoding". This option only affects name lookups that your server - does on behalf of clients. (Default: 1) - -</dd> -<dt class="hdlist1"> -GeoIPFile filename -</dt> -<dd> - - A filename containing GeoIP data, for use with BridgeRecordUsageByCountry. - -</dd> -</dl></div> -</div> -<h2 id="_directory_server_options">DIRECTORY SERVER OPTIONS</h2> -<div class="sectionbody"> -<div class="paragraph">The following options are useful only for directory servers (that is, -if DirPort is non-zero):</div> -<div class="dlist"><dl> -<dt class="hdlist1"> -AuthoritativeDirectory 0|1 -</dt> -<dd> - - When this option is set to 1, Tor operates as an authoritative directory - server. Instead of caching the directory, it generates its own list of - good servers, signs it, and sends that to the clients. Unless the clients - already have you listed as a trusted directory, you probably do not want - to set this option. Please coordinate with the other admins at - <a href="mailto:tor-ops@torproject.org">tor-ops(a)torproject.org</a> if you think you should be a directory. - -</dd> -<dt class="hdlist1"> -DirPortFrontPage FILENAME -</dt> -<dd> - - When this option is set, it takes an HTML file and publishes it as "/" on - the DirPort. Now relay operators can provide a disclaimer without needing - to set up a separate webserver. There’s a sample disclaimer in - contrib/tor-exit-notice.html. - -</dd> -<dt class="hdlist1"> -V1AuthoritativeDirectory 0|1 -</dt> -<dd> - - When this option is set in addition to AuthoritativeDirectory, Tor - generates version 1 directory and running-routers documents (for legacy - Tor clients up to 0.1.0.x). - -</dd> -<dt class="hdlist1"> -V2AuthoritativeDirectory 0|1 -</dt> -<dd> - - When this option is set in addition to AuthoritativeDirectory, Tor - generates version 2 network statuses and serves descriptors, etc as - described in doc/spec/dir-spec-v2.txt (for Tor clients and servers running - 0.1.1.x and 0.1.2.x). - -</dd> -<dt class="hdlist1"> -V3AuthoritativeDirectory 0|1 -</dt> -<dd> - - When this option is set in addition to AuthoritativeDirectory, Tor - generates version 3 network statuses and serves descriptors, etc as - described in doc/spec/dir-spec.txt (for Tor clients and servers running at - least 0.2.0.x). - -</dd> -<dt class="hdlist1"> -VersioningAuthoritativeDirectory 0|1 -</dt> -<dd> - - When this option is set to 1, Tor adds information on which versions of - Tor are still believed safe for use to the published directory. Each - version 1 authority is automatically a versioning authority; version 2 - authorities provide this service optionally. See RecommendedVersions, - RecommendedClientVersions, and RecommendedServerVersions. - -</dd> -<dt class="hdlist1"> -NamingAuthoritativeDirectory 0|1 -</dt> -<dd> - - When this option is set to 1, then the server advertises that it has - opinions about nickname-to-fingerprint bindings. It will include these - opinions in its published network-status pages, by listing servers with - the flag "Named" if a correct binding between that nickname and fingerprint - has been registered with the dirserver. Naming dirservers will refuse to - accept or publish descriptors that contradict a registered binding. See - approved-routers in the FILES section below. - -</dd> -<dt class="hdlist1"> -HSAuthoritativeDir 0|1 -</dt> -<dd> - - When this option is set in addition to - AuthoritativeDirectory, Tor also accepts and serves hidden - service descriptors. (Default: 0) - -</dd> -<dt class="hdlist1"> -HSAuthorityRecordStats 0|1 -</dt> -<dd> - - When this option is set in addition to HSAuthoritativeDir, - Tor periodically (every 15 minutes) writes statistics about hidden service - usage to a file hsusage in its data directory. (Default: - 0) - -</dd> -<dt class="hdlist1"> -HidServDirectoryV2 0|1 -</dt> -<dd> - - When this option is set, Tor accepts and serves v2 hidden service - descriptors. Setting DirPort is not required for this, because clients - connect via the ORPort by default. (Default: 1) - -</dd> -<dt class="hdlist1"> -BridgeAuthoritativeDir 0|1 -</dt> -<dd> - - When this option is set in addition to AuthoritativeDirectory, Tor - accepts and serves router descriptors, but it caches and serves the main - networkstatus documents rather than generating its own. (Default: 0) - -</dd> -<dt class="hdlist1"> -MinUptimeHidServDirectoryV2 N seconds|minutes|hours|days|weeks -</dt> -<dd> - - Minimum uptime of a v2 hidden service directory to be accepted as such by - authoritative directories. (Default: 24 hours) - -</dd> -<dt class="hdlist1"> -DirPort PORT -</dt> -<dd> - - Advertise the directory service on this port. - -</dd> -<dt class="hdlist1"> -DirListenAddress IP[:PORT] -</dt> -<dd> - - Bind the directory service to this address. If you specify a port, bind to - this port rather than the one specified in DirPort. (Default: 0.0.0.0) - This directive can be specified multiple times to bind to multiple - addresses/ports. - -</dd> -<dt class="hdlist1"> -DirPolicy policy,policy,… -</dt> -<dd> - - Set an entrance policy for this server, to limit who can connect to the - directory ports. The policies have the same form as exit policies above. - -</dd> -</dl></div> -</div> -<h2 id="_directory_authority_server_options">DIRECTORY AUTHORITY SERVER OPTIONS</h2> -<div class="sectionbody"> -<div class="dlist"><dl> -<dt class="hdlist1"> -RecommendedVersions STRING -</dt> -<dd> - - STRING is a comma-separated list of Tor versions currently believed to be - safe. The list is included in each directory, and nodes which pull down the - directory learn whether they need to upgrade. This option can appear - multiple times: the values from multiple lines are spliced together. When - this is set then VersioningAuthoritativeDirectory should be set too. - -</dd> -<dt class="hdlist1"> -RecommendedClientVersions STRING -</dt> -<dd> - - STRING is a comma-separated list of Tor versions currently believed to be - safe for clients to use. This information is included in version 2 - directories. If this is not set then the value of RecommendedVersions - is used. When this is set then VersioningAuthoritativeDirectory should - be set too. - -</dd> -<dt class="hdlist1"> -RecommendedServerVersions STRING -</dt> -<dd> - - STRING is a comma-separated list of Tor versions currently believed to be - safe for servers to use. This information is included in version 2 - directories. If this is not set then the value of RecommendedVersions - is used. When this is set then VersioningAuthoritativeDirectory should - be set too. - -</dd> -<dt class="hdlist1"> -DirAllowPrivateAddresses 0|1 -</dt> -<dd> - - If set to 1, Tor will accept router descriptors with arbitrary "Address" - elements. Otherwise, if the address is not an IP address or is a private IP - address, it will reject the router descriptor. Defaults to 0. - -</dd> -<dt class="hdlist1"> -AuthDirBadDir AddressPattern… -</dt> -<dd> - - Authoritative directories only. A set of address patterns for servers that - will be listed as bad directories in any network status document this - authority publishes, if AuthDirListBadDirs is set. - -</dd> -<dt class="hdlist1"> -AuthDirBadExit AddressPattern… -</dt> -<dd> - - Authoritative directories only. A set of address patterns for servers that - will be listed as bad exits in any network status document this authority - publishes, if AuthDirListBadExits is set. - -</dd> -<dt class="hdlist1"> -AuthDirInvalid AddressPattern… -</dt> -<dd> - - Authoritative directories only. A set of address patterns for servers that - will never be listed as "valid" in any network status document that this - authority publishes. - -</dd> -<dt class="hdlist1"> -AuthDirReject AddressPattern… -</dt> -<dd> - - Authoritative directories only. A set of address patterns for servers that - will never be listed at all in any network status document that this - authority publishes, or accepted as an OR address in any descriptor - submitted for publication by this authority. - -</dd> -<dt class="hdlist1"> -AuthDirListBadDirs 0|1 -</dt> -<dd> - - Authoritative directories only. If set to 1, this directory has some - opinion about which nodes are unsuitable as directory caches. (Do not set - this to 1 unless you plan to list non-functioning directories as bad; - otherwise, you are effectively voting in favor of every declared - directory.) - -</dd> -<dt class="hdlist1"> -AuthDirListBadExits 0|1 -</dt> -<dd> - - Authoritative directories only. If set to 1, this directory has some - opinion about which nodes are unsuitable as exit nodes. (Do not set this to - 1 unless you plan to list non-functioning exits as bad; otherwise, you are - effectively voting in favor of every declared exit as an exit.) - -</dd> -<dt class="hdlist1"> -AuthDirRejectUnlisted 0|1 -</dt> -<dd> - - Authoritative directories only. If set to 1, the directory server rejects - all uploaded server descriptors that aren’t explicitly listed in the - fingerprints file. This acts as a "panic button" if we get hit with a Sybil - attack. (Default: 0) - -</dd> -<dt class="hdlist1"> -AuthDirMaxServersPerAddr NUM -</dt> -<dd> - - Authoritative directories only. The maximum number of servers that we will - list as acceptable on a single IP address. Set this to "0" for "no limit". - (Default: 2) - -</dd> -<dt class="hdlist1"> -AuthDirMaxServersPerAuthAddr NUM -</dt> -<dd> - - Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies - to addresses shared with directory authorities. (Default: 5) - -</dd> -<dt class="hdlist1"> -V3AuthVotingInterval N minutes|hours -</dt> -<dd> - - V3 authoritative directories only. Configures the server’s preferred voting - interval. Note that voting will actually happen at an interval chosen - by consensus from all the authorities' preferred intervals. This time - SHOULD divide evenly into a day. (Default: 1 hour) - -</dd> -<dt class="hdlist1"> -V3AuthVoteDelay N minutes|hours -</dt> -<dd> - - V3 authoritative directories only. Configures the server’s preferred delay - between publishing its vote and assuming it has all the votes from all the - other authorities. Note that the actual time used is not the server’s - preferred time, but the consensus of all preferences. (Default: 5 minutes.) - -</dd> -<dt class="hdlist1"> -V3AuthDistDelay N minutes|hours -</dt> -<dd> - - V3 authoritative directories only. Configures the server’s preferred delay - between publishing its consensus and signature and assuming it has all the - signatures from all the other authorities. Note that the actual time used - is not the server’s preferred time, but the consensus of all preferences. - (Default: 5 minutes.) - -</dd> -<dt class="hdlist1"> -V3AuthNIntervalsValid NUM -</dt> -<dd> - - V3 authoritative directories only. Configures the number of VotingIntervals - for which each consensus should be valid for. Choosing high numbers - increases network partitioning risks; choosing low numbers increases - directory traffic. Note that the actual number of intervals used is not the - server’s preferred number, but the consensus of all preferences. Must be at - least 2. (Default: 3.) - -</dd> -</dl></div> -</div> -<h2 id="_hidden_service_options">HIDDEN SERVICE OPTIONS</h2> -<div class="sectionbody"> -<div class="paragraph">The following options are used to configure a hidden service.</div> -<div class="dlist"><dl> -<dt class="hdlist1"> -HiddenServiceDir DIRECTORY -</dt> -<dd> - - Store data files for a hidden service in DIRECTORY. Every hidden service - must have a separate directory. You may use this option multiple times to - specify multiple services. - -</dd> -<dt class="hdlist1"> -HiddenServicePort VIRTPORT [TARGET] -</dt> -<dd> - - Configure a virtual port VIRTPORT for a hidden service. You may use this - option multiple times; each time applies to the service using the most - recent hiddenservicedir. By default, this option maps the virtual port to - the same port on 127.0.0.1. You may override the target port, address, or - both by specifying a target of addr, port, or addr:port. You may also have - multiple lines with the same VIRTPORT: when a user connects to that - VIRTPORT, one of the TARGETs from those lines will be chosen at random. - -</dd> -<dt class="hdlist1"> -PublishHidServDescriptors 0|1 -</dt> -<dd> - - If set to 0, Tor will run any hidden services you configure, but it won’t - advertise them to the rendezvous directory. This option is only useful if - you’re using a Tor controller that handles hidserv publishing for you. - (Default: 1) - -</dd> -<dt class="hdlist1"> -HiddenServiceVersion version,version,… -</dt> -<dd> - - A list of rendezvous service descriptor versions to publish for the hidden - service. Currently, only version 2 is supported. (Default: 2) - -</dd> -<dt class="hdlist1"> -HiddenServiceAuthorizeClient auth-type client-name,client-name,… -</dt> -<dd> - - If configured, the hidden service is accessible for authorized clients - only. The auth-type can either be 'basic' for a general-purpose - authorization protocol or 'stealth' for a less scalable protocol that also - hides service activity from unauthorized clients. Only clients that are - listed here are authorized to access the hidden service. Valid client names - are 1 to 19 characters long and only use characters in A-Za-z0-9+-_ (no - spaces). If this option is set, the hidden service is not accessible for - clients without authorization any more. Generated authorization data can be - found in the hostname file. Clients need to put this authorization data in - their configuration file using HidServAuth. - -</dd> -<dt class="hdlist1"> -RendPostPeriod N seconds|minutes|hours|days|weeks -</dt> -<dd> - - Every time the specified period elapses, Tor uploads any rendezvous - service descriptors to the directory servers. This information is also - uploaded whenever it changes. (Default: 1 hour) - -</dd> -</dl></div> -</div> -<h2 id="_testing_network_options">TESTING NETWORK OPTIONS</h2> -<div class="sectionbody"> -<div class="paragraph">The following options are used for running a testing Tor network.</div> -<div class="dlist"><dl> -<dt class="hdlist1"> -TestingTorNetwork 0|1 -</dt> -<dd> - - If set to 1, Tor adjusts default values of the configuration options below, - so that it is easier to set up a testing Tor network. May only be set if - non-default set of DirServers is set. Cannot be unset while Tor is running. - (Default: 0) - -<div class="literalblock"> -<div class="content"> -<pre><tt>ServerDNSAllowBrokenConfig 1^M -DirAllowPrivateAddresses 1^M -EnforceDistinctSubnets 0^M -AssumeReachable 1^M -AuthDirMaxServersPerAddr 0^M -AuthDirMaxServersPerAuthAddr 0^M -ClientDNSRejectInternalAddresses 0^M -ExitPolicyRejectPrivate 0^M -V3AuthVotingInterval 5 minutes^M -V3AuthVoteDelay 20 seconds^M -V3AuthDistDelay 20 seconds^M -TestingV3AuthInitialVotingInterval 5 minutes^M -TestingV3AuthInitialVoteDelay 20 seconds^M -TestingV3AuthInitialDistDelay 20 seconds^M -TestingAuthDirTimeToLearnReachability 0 minutes^M -TestingEstimatedDescriptorPropagationTime 0 minutes</tt></pre> -</div></div> -</dd> -<dt class="hdlist1"> -TestingV3AuthInitialVotingInterval N minutes|hours -</dt> -<dd> - - Like V3AuthVotingInterval, but for initial voting interval before the first - consensus has been created. Changing this requires that - TestingTorNetwork is set. (Default: 30 minutes) - -</dd> -<dt class="hdlist1"> -TestingV3AuthInitialVoteDelay N minutes|hours -</dt> -<dd> - - Like TestingV3AuthInitialVoteDelay, but for initial voting interval before - the first consensus has been created. Changing this requires that - TestingTorNetwork is set. (Default: 5 minutes) - -</dd> -<dt class="hdlist1"> -TestingV3AuthInitialDistDelay N minutes|hours -</dt> -<dd> - - Like TestingV3AuthInitialDistDelay, but for initial voting interval before - the first consensus has been created. Changing this requires that - TestingTorNetwork is set. (Default: 5 minutes) - -</dd> -<dt class="hdlist1"> -TestingAuthDirTimeToLearnReachability N minutes|hours -</dt> -<dd> - - After starting as an authority, do not make claims about whether routers - are Running until this much time has passed. Changing this requires - that TestingTorNetwork is set. (Default: 30 minutes) - -</dd> -<dt class="hdlist1"> -TestingEstimatedDescriptorPropagationTime N minutes|hours -</dt> -<dd> - - Clients try downloading router descriptors from directory caches after this - time. Changing this requires that TestingTorNetwork is set. (Default: - 10 minutes) - -</dd> -</dl></div> -</div> -<h2 id="_signals">SIGNALS</h2> -<div class="sectionbody"> -<div class="paragraph">Tor catches the following signals:</div> -<div class="dlist"><dl> -<dt class="hdlist1"> -SIGTERM -</dt> -<dd> - - Tor will catch this, clean up and sync to disk if necessary, and exit. - -</dd> -<dt class="hdlist1"> -SIGINT -</dt> -<dd> - - Tor clients behave as with SIGTERM; but Tor servers will do a controlled - slow shutdown, closing listeners and waiting 30 seconds before exiting. - (The delay can be configured with the ShutdownWaitLength config option.) - -</dd> -<dt class="hdlist1"> -SIGHUP -</dt> -<dd> - - The signal instructs Tor to reload its configuration (including closing and - reopening logs), and kill and restart its helper processes if applicable. - -</dd> -<dt class="hdlist1"> -SIGUSR1 -</dt> -<dd> - - Log statistics about current connections, past connections, and throughput. - -</dd> -<dt class="hdlist1"> -SIGUSR2 -</dt> -<dd> - - Switch all logs to loglevel debug. You can go back to the old loglevels by - sending a SIGHUP. - -</dd> -<dt class="hdlist1"> -SIGCHLD -</dt> -<dd> - - Tor receives this signal when one of its helper processes has exited, so it - can clean up. - -</dd> -<dt class="hdlist1"> -SIGPIPE -</dt> -<dd> - - Tor catches this signal and ignores it. - -</dd> -<dt class="hdlist1"> -SIGXFSZ -</dt> -<dd> - - If this signal exists on your platform, Tor catches and ignores it. - -</dd> -</dl></div> -</div> -<h2 id="_files">FILES</h2> -<div class="sectionbody"> -<div class="dlist"><dl> -<dt class="hdlist1"> -@CONFDIR@/torrc -</dt> -<dd> - - The configuration file, which contains "option value" pairs. - -</dd> -<dt class="hdlist1"> -@LOCALSTATEDIR@/lib/tor/ -</dt> -<dd> - - The tor process stores keys and other data here. - -</dd> -<dt class="hdlist1"> -DataDirectory/cached-status/ -</dt> -<dd> - - The most recently downloaded network status document for each authority. - Each file holds one such document; the filenames are the hexadecimal - identity key fingerprints of the directory authorities. - -</dd> -<dt class="hdlist1"> -DataDirectory/cached-descriptors and cached-descriptors.new -</dt> -<dd> - - These files hold downloaded router statuses. Some routers may appear more - than once; if so, the most recently published descriptor is used. Lines - beginning with @-signs are annotations that contain more information about - a given router. The ".new" file is an append-only journal; when it gets - too large, all entries are merged into a new cached-descriptors file. - -</dd> -<dt class="hdlist1"> -DataDirectory/cached-routers and cached-routers.new -</dt> -<dd> - - Obsolete versions of cached-descriptors and cached-descriptors.new. When - Tor can’t find the newer files, it looks here instead. - -</dd> -<dt class="hdlist1"> -DataDirectory/state -</dt> -<dd> - - A set of persistent key-value mappings. These are documented in - the file. These include: - -<div class="ulist"><ul> -<li> - -The current entry guards and their status. - -</li> -<li> - -The current bandwidth accounting values (unused so far; see - below). - -</li> -<li> - -When the file was last written - -</li> -<li> - -What version of Tor generated the state file - -</li> -<li> - -A short history of bandwidth usage, as produced in the router - descriptors. - -</li> -</ul></div> -</dd> -<dt class="hdlist1"> -DataDirectory/bw_accounting -</dt> -<dd> - - Used to track bandwidth accounting values (when the current period starts - and ends; how much has been read and written so far this period). This file - is obsolete, and the data is now stored in the 'state' file as well. Only - used when bandwidth accounting is enabled. - -</dd> -<dt class="hdlist1"> -DataDirectory/control_auth_cookie -</dt> -<dd> - - Used for cookie authentication with the controller. Location can be - overridden by the CookieAuthFile config option. Regenerated on startup. See - control-spec.txt for details. Only used when cookie authentication is - enabled. - -</dd> -<dt class="hdlist1"> -DataDirectory/keys/* -</dt> -<dd> - - Only used by servers. Holds identity keys and onion keys. - -</dd> -<dt class="hdlist1"> -DataDirectory/fingerprint -</dt> -<dd> - - Only used by servers. Holds the fingerprint of the server’s identity key. - -</dd> -<dt class="hdlist1"> -DataDirectory/approved-routers -</dt> -<dd> - - Only for naming authoritative directory servers (see - NamingAuthoritativeDirectory). This file lists nickname to identity - bindings. Each line lists a nickname and a fingerprint separated by - whitespace. See your fingerprint file in the DataDirectory for an - example line. If the nickname is !reject then descriptors from the - given identity (fingerprint) are rejected by this server. If it is - !invalid then descriptors are accepted but marked in the directory as - not valid, that is, not recommended. - -</dd> -<dt class="hdlist1"> -DataDirectory/router-stability -</dt> -<dd> - - Only used by authoritative directory servers. Tracks measurements for - router mean-time-between-failures so that authorities have a good idea of - how to set their Stable flags. - -</dd> -<dt class="hdlist1"> -HiddenServiceDirectory/hostname -</dt> -<dd> - - The <base32-encoded-fingerprint>.onion domain name for this hidden service. - If the hidden service is restricted to authorized clients only, this file - also contains authorization data for all clients. - -</dd> -<dt class="hdlist1"> -HiddenServiceDirectory/private_key -</dt> -<dd> - - The private key for this hidden service. - -</dd> -<dt class="hdlist1"> -HiddenServiceDirectory/client_keys -</dt> -<dd> - - Authorization data for a hidden service that is only accessible by - authorized clients. - -</dd> -</dl></div> -</div> -<h2 id="_see_also">SEE ALSO</h2> -<div class="sectionbody"> -<div class="paragraph">privoxy(1), tsocks(1), torify(1) </div> -<div class="paragraph">https://www.torproject.org/</div> -</div> -<h2 id="_bugs">BUGS</h2> -<div class="sectionbody"> -<div class="paragraph">Plenty, probably. Tor is still in development. Please report them.</div> -</div> -<h2 id="_authors">AUTHORS</h2> -<div class="sectionbody"> -<div class="paragraph">Roger Dingledine [arma at mit.edu] Nick Mathewson [nickm at alum.mit.edu]</div> -</div> -</div> + <div id="maincol"> + <: + die "Missing git clone at $(TORGIT)" unless -d "$(TORGIT)"; + my $man = `GIT_DIR=$(TORGIT) git show $(STABLETAG):doc/tor.1.txt | asciidoc -d manpage -s -o - -`; + die "No manpage because of asciidoc error or file not available from git" unless $man; + print $man; + :> + </div>  -<div id = "sidecol"> + <div id = "sidecol"> #include "side.wmi" #include "info.wmi" + </div> +  </div> - -</div>  -#include <foot.wmi> +#include <foot.wmi>

1 0

r24980: {website} add macros to new download page so it will display the corre (website/trunk/download/en)
by Erinn Clark 29 Aug '11

29 Aug '11

Author: erinn Date: 2011-08-29 22:17:05 +0000 (Mon, 29 Aug 2011) New Revision: 24980 Modified: website/trunk/download/en/download.wml Log: add macros to new download page so it will display the correct versions Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-08-29 21:58:43 UTC (rev 24979) +++ website/trunk/download/en/download.wml 2011-08-29 22:17:05 UTC (rev 24980) @@ -215,8 +215,8 @@ <h2>Source Tarball</h2> Configure with: <code style="color: #666666;">./configure && make && src/or/tor</code> - The current stable version of Tor is 0.2.1.30. Its <a href="https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog">release notes</a> are available. - The current unstable/alpha version of Tor is 0.2.2.30-rc. Its <a href="https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/Change…">Changelog</a> is available. + The current stable version of Tor is <version-stable>. Its <a href="https://gitweb.torproject.org/tor.git/blob/release-0.2.1:/ChangeLog">release notes</a> are available. + The current unstable/alpha version of Tor is <version-alpha>. Its <a href="https://gitweb.torproject.org/tor.git/blob/refs/heads/release-0.2.2:/Change…">Changelog</a> is available. </div> </div>

1 0

r24979: {} add dlhead for the download page. (website/trunk/download/en)
by Andrew Lewman 29 Aug '11

29 Aug '11

Author: phobos Date: 2011-08-29 21:58:43 +0000 (Mon, 29 Aug 2011) New Revision: 24979 Added: website/trunk/download/en/dlhead.wmi Log: add dlhead for the download page. Added: website/trunk/download/en/dlhead.wmi =================================================================== --- website/trunk/download/en/dlhead.wmi (rev 0) +++ website/trunk/download/en/dlhead.wmi 2011-08-29 21:58:43 UTC (rev 24979) @@ -0,0 +1,223 @@ +#! /usr/bin/wml +<: use strict; :> +<: use warnings; :> +#use "perl-globals.wmi" +#use "links.wmi" +#use "versions.wmi" +#use "navigation.wmi" + +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> +<html> +<head> + <title>$(TITLE)</title> + <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico"> + <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> + <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> + <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" +type="application/rss+xml">"> + + # begin WML to generate css/js paths + <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> + <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> + + #<link href="css/master.css" rel="stylesheet" type="text/css"> +  +  +  + +# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> + # end WML to generate css/js paths + + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> + <meta name="author" content="The Tor Project, Inc."> + <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> + <script type="text/javascript" src="../js/jquery.min.js"> +# /* jQuery */ + </script> + <script type="text/javascript" src="../js/jquery.client.min.js"> +/* "jQuery Browser And OS Detection Plugin" by Stoimen + Source: http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug… + License: Public Domain (http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug…) */ + </script> + <script type="text/javascript" src="../js/dlpage01.js"> +# /* Displays detected section */ + </script> + <script async type="text/javascript" src="../js/jquery.accordion.min.js"> +/* Modified version of "Stupid Simple jQuery Accordian Menu" originally developed by Ryan Stemkoski + Source: http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/ + License: Public Domain (http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/#comment-32882) */ + </script> + <script async type="text/javascript"> +# /* switches package links depending on selection */ + function updateLang() { + var caller = $( this ); + var pkg = caller.attr('id'); + var lang = caller.val(); + var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; + var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip'; + var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz'; + var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz'; + if(pkg == 'win-tbb'){ + $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'">DownloadTor Browser Bundle</a>'); + $('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>'); + }else if(pkg == 'osx-tbb'){ + $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'">DownloadTor Browser Bundle (Beta)</a>'); + $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>'); + }else if(pkg == 'lin-tbb32'){ + $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'">Downloadi686 / 32-bit (Beta)</a>'); + $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>'); + }else if(pkg == 'lin-tbb64'){ + $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'">Downloadx86_64 / 64-bit (Beta)</a>'); + $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>'); + } + } + + $(function(){ + $('.lang').ready(updateLang); + $('.lang').change(updateLang); + /* Only show language selector if javascript is enabled */ + $('.lang').css('display', 'block'); + }); + </script> + <script async type="text/javascript"> + function displayVals() { + var t3 = $("#t3").val(); + var amount = $("#amount").val(); + if(t3 != 0){ + $('#a3').val(amount); + $('#p3').val(1); + $('#cmd').val('_xclick-subscriptions'); + $('#item_name').val('Tor Project Membership'); + $('#ppinfo').replaceWith('<h6 id="ppinfo">(Requires a PayPal Account)</h6>'); + }else{ + $('#a3').val(0); + $('#p3').val(0); + $('#cmd').val('_donations'); + $('#item_name').val('Donation to the Tor Project'); + $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + if( !t3 ) { + $('#cmd').val('_donations'); + $('#item_name').val('Donation to the Tor Project'); + $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + } + $(function(){ + $("#amount").change(displayVals); + $("#t3").change(displayVals); + displayVals(); + }); + </script> +</head> +<body onload="resetAll()" onunload=""> +<div id="wrap"> + <div id="header"> + <h1 id="logo"><a href="<page index>">Tor</a></h1> + # navigation menu generation + <div id="nav"> + <ul> + <:{ + # create a hash and maintain order of keys + my %navigation; + my @keys; + while (@navigation) { + my $key = shift @navigation; + my $val = shift @navigation; + push @keys, $key; + $navigation{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory of active link, set class active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + + # translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; + } + # english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key}; + } + # full url + elsif ($key =~/^http/) { + printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to +docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + # end navigation generation + <div id="calltoaction"> + <ul> + <:{ + my %calltoaction; + my @keys; + while (@calltoaction) { + my $key = shift @calltoaction; + my $val = shift @calltoaction; + push @keys, $key; + $calltoaction{$key} = $val; + } + + my $page = $WML_SRC_BASENAME; + my $lang = "$(LANG)"; + for my $key (@keys) { + my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; + + # in directory, set active + my $class; + if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { + #if ($WML_SRC_BASENAME eq $base) { + $class = 'class="active"'; + } else { + $class = ''; + } + + $dir = '.' unless defined $dir; + # try to use a translated version + if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; + } + # default to english version + elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { + printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", + stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key}; + } else { + warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; + } + } + }:> + </ul> + </div> +  + </div> +  + +#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> +#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>.">

1 0

r24978: {} pre-stage the press release about 0.2.2.32. (website/trunk/press/en)
by Andrew Lewman 29 Aug '11

29 Aug '11

Author: phobos Date: 2011-08-29 21:46:02 +0000 (Mon, 29 Aug 2011) New Revision: 24978 Added: website/trunk/press/en/2011-08-28-tor-022-stable.wml Log: pre-stage the press release about 0.2.2.32. Added: website/trunk/press/en/2011-08-28-tor-022-stable.wml =================================================================== --- website/trunk/press/en/2011-08-28-tor-022-stable.wml (rev 0) +++ website/trunk/press/en/2011-08-28-tor-022-stable.wml 2011-08-29 21:46:02 UTC (rev 24978) @@ -0,0 +1,88 @@ +## translation metadata +# Revision: $Revision: 24667 $ +# Translation-Priority: 4-optional + +#include "head.wmi" TITLE="The Tor Project announces a new stable release of Tor" CHARSET="UTF-8" +<div id="content" class="clearfix"> + <div id="breadcrumbs"> + <a href="<page index>">Home » </a> + <a href="<page press/press>">Press » </a> + <a href="<page press/2011-08-28-tor-022-stable>">The Tor Project announces a new stable release of Tor</a> + </div> + <div id="maincol"> + + +<h2>FOR IMMEDIATE RELEASE</h2> + +<h2>TOR PROJECT ANNOUNCES NEW STABLE RELEASE</h2> + +WALPOLE, MA The Tor Project announces a new stable +release of the Tor software. More than two years in the making, +this release features improved client performance and hidden service +reliability, better compatibility for Android, correct behavior for +bridges that listen on more than one address, more extensible and flexible +directory object handling, better reporting of network statistics, +improved code security, and many many other features and bugfixes. + +This release series is dedicated to the memory of Andreas Pfitzmann +(1958-2010), a pioneer in anonymity and privacy research, a founder of the +PETS community, a leader in our field, a mentor, and a friend. He left +us with these words: +<blockquote>"I had the possibility to contribute to this world that +is not as it should be. I hope I could help in some areas to make the +world a better place, and that I could also encourage other people to +be engaged in improving the world. Please, stay engaged. This world +needs you, your love, your initiative -- now I cannot be part of that +anymore."</blockquote> + +Tor's tools and technologies are already used by millions of people +to protect their activities online. These users include journalists and +human rights workers in politically rigid countries communicating with +whistleblowers and dissidents. Law enforcement officers on Internet +sting operations stay anonymous with Tor, as do people wanting to post +socially sensitive information in chat rooms, like rape or abuse survivors +and those with illnesses. The Tor network also provides protection +for people looking for another layer of privacy from the millions of +websites and ISPs bent on collecting private information and tracking +their moves online. + +Pre-compiled and configured versions of Tor can be found on <a +href="<page download/download>">the download page</a>. + +<h2>ABOUT THE TOR PROJECT</h2> + +Based in Walpole, MA, The Tor Project develops free and open-source +software that provides online anonymity to the everyday Internet +user. Tor was born out of a collaboration with the U.S. Naval Research +Lab starting in 2001, and it became an official U.S. 501(c)(3) non-profit +in 2006. The Tor Project now works with many individuals, NGOs, law +enforcement agencies, and businesses globally to help them protect their +anonymity online. + +In addition to its efforts developing and maintaining the Tor anonymity +software and the Tor network, The Tor Project also helps to lead the +research community in understanding how to build and measure scalable and +secure anonymity networks. The Tor developers publish several new research +papers each year in major academic security conferences, and just about +every major security conference these days includes a Tor-related paper. +Tor is a project-funded organization with a staff of 15. + +The "Onion Logo" and "Tor" wordmark are registered trademarks +of The Tor Project, Inc. + +Contact: Andrew Lewman +Tel: +1-781-352-0568 +Email: execdir(a)torproject.org +<a href="https://www.torproject.org/">Website: Tor Project</a> +<div align=center>###</div> + +</div> +  + <div id = "sidecol"> +#include "side.wmi" +#include "info.wmi" + </div> +  +</div> + +#include <foot.wmi> Property changes on: website/trunk/press/en/2011-08-28-tor-022-stable.wml ___________________________________________________________________ Added: svn:mime-type + text/vnd.wap.wml

1 0

[tor/master] Add a bufferevent note to startup log
by nickm＠torproject.org 29 Aug '11

29 Aug '11

commit b51e21c5d0193d05a965b3b5f7e1435300d23333 Author: Sebastian Hahn <sebastian(a)torproject.org> Date: Mon Aug 29 23:10:03 2011 +0200 Add a bufferevent note to startup log This should help us easily spot if a tor was built with --enable-bufferevent or not --- src/or/main.c | 9 +++++++-- 1 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/or/main.c b/src/or/main.c index 260de16..ad06fed 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -2156,8 +2156,13 @@ tor_init(int argc, char *argv[]) } quiet_level = quiet; - log(LOG_NOTICE, LD_GENERAL, "Tor v%s. This is experimental software. " - "Do not rely on it for strong anonymity. (Running on %s)",get_version(), + log(LOG_NOTICE, LD_GENERAL, "Tor v%s%s. This is experimental software. " + "Do not rely on it for strong anonymity. (Running on %s)", get_version(), +#ifdef USE_BUFFEREVENTS + " (with bufferevents)", +#else + "", +#endif get_uname()); if (network_init()<0) {

1 0

r24977: {website} patches to download page to fix some display issues, layout (in website/trunk: css donate/en download/en js)
by Andrew Lewman 29 Aug '11

29 Aug '11

Author: phobos Date: 2011-08-29 18:50:48 +0000 (Mon, 29 Aug 2011) New Revision: 24977 Removed: website/trunk/download/en/head.wmi website/trunk/js/ppwidget.js Modified: website/trunk/css/layout-rtl.css website/trunk/css/layout.css website/trunk/donate/en/donate.wml website/trunk/donate/en/thankyou-head.wmi website/trunk/download/en/download.wml Log: patches to download page to fix some display issues, layout issues, and organization issues, from jeremy Modified: website/trunk/css/layout-rtl.css =================================================================== --- website/trunk/css/layout-rtl.css 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/css/layout-rtl.css 2011-08-29 18:50:48 UTC (rev 24977) @@ -331,6 +331,11 @@ padding-right: 0px; } + .dbox.donate ul.amounts li { + margin-left: 0px; + margin-right: 15px; + } + #footer .about { padding-left: 30px; border-left: 1px solid #ddd; Modified: website/trunk/css/layout.css =================================================================== --- website/trunk/css/layout.css 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/css/layout.css 2011-08-29 18:50:48 UTC (rev 24977) @@ -67,99 +67,94 @@ width: auto; } - #calltoaction { - height: 30px; - float: right; - margin-top: 10px; - margin-right: 5px; - text-align: center; - } +#calltoaction { + height: 30px; + float: right; + margin-top: 10px; + margin-right: 5px; + text-align: center; + } - #calltoaction ul { - padding: 0; - margin: 0px; - height: 30px; - list-style: none; - float: right; + #calltoaction ul { + padding: 0; + margin: 0px; + height: 30px; + list-style: none; + float: right; } - - #calltoaction ul li { - list-style: none; - display: inline; - float: none; - width: 100px; - margin-left: 0px; - } - - #calltoaction ul li a:link, - #calltoaction ul li a:visited { - background: url(../images/cta-buttons.jpg) top center no-repeat #885ca4; - padding: 8px 8px 0px; - color: #FFFFFF; - font-weight: bold; - text-decoration: none; - font-size: 1.067em; - line-height: 1.067em; - height: 22px; - width: 84px; - float: left; - text-shadow: 0px -1px 2px #111111, 0px 1px 2px #666666; - } - #calltoaction ul li:first-child a:link, - #calltoaction ul li:first-child a:visited { - background: url(../images/cta-buttons.jpg) top left no-repeat #885ca4; - -webkit-border-top-left-radius: 7px; - -webkit-border-bottom-left-radius: 7px; - -moz-border-radius-topleft: 7px; - -moz-border-radius-bottomleft: 7px; - border-top-left-radius: 7px; - border-bottom-left-radius: 7px; - padding-left: 7px; - width: 85px; - } + #calltoaction ul li { + list-style: none; + display: inline; + float: none; + width: 100px; + margin-left: 0px; + } + + #calltoaction ul li a:link, + #calltoaction ul li a:visited { + display: block; + background: url(../images/cta-buttons.jpg) top center no-repeat #885ca4; + padding: 4px 8px; + color: #FFFFFF; + font-weight: bold; + text-decoration: none; + font-size: 13px; + line-height: 22px; + height: 22px; + width: 84px; + float: left; + text-shadow: 1px 1px 0px #111111; + } - #calltoaction ul li:last-child a:link, - #calltoaction ul li:last-child a:visited { - background: url(../images/cta-buttons.jpg) top right no-repeat #885ca4; - -webkit-border-top-right-radius: 7px; - -webkit-border-bottom-right-radius: 7px; - -moz-border-radius-topright: 7px; - -moz-border-radius-bottomright: 7px; - border-top-right-radius: 7px; - border-bottom-right-radius: 7px; - padding-right: 9px; - width: 83px; - color: #FFFFFF; - } - - #calltoaction ul li:hover a { - background: url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800; - font-weight: bold; - text-shadow: 1px 1px 4px #111111; - } - - #calltoaction ul li:hover:first-child a { - background: url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800; - -webkit-border-top-left-radius: 7px; - -webkit-border-bottom-left-radius: 7px; - -moz-border-radius-topleft: 7px; - -moz-border-radius-bottomleft: 7px; - border-top-left-radius: 7px; - border-bottom-left-radius: 7px; - } + #calltoaction ul li:hover a { + background: url(../images/cta-buttons.jpg) bottom center no-repeat #ff9800; + font-weight: bold; + text-shadow: 1px 1px 0px #111111; + } + + #calltoaction ul li:first-child a:link, + #calltoaction ul li:first-child a:visited, + #calltoaction ul li:hover:first-child a { + -webkit-border-top-left-radius: 7px; + -webkit-border-bottom-left-radius: 7px; + -moz-border-radius-topleft: 7px; + -moz-border-radius-bottomleft: 7px; + border-top-left-radius: 7px; + border-bottom-left-radius: 7px; + } - #calltoaction ul li:hover:last-child a { - background: url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800; - -webkit-border-top-right-radius: 7px; - -webkit-border-bottom-right-radius: 7px; - -moz-border-radius-topright: 7px; - -moz-border-radius-bottomright: 7px; - border-top-right-radius: 7px; - border-bottom-right-radius: 7px; - } + #calltoaction ul li:first-child a:link, + #calltoaction ul li:first-child a:visited { + background: url(../images/cta-buttons.jpg) top left no-repeat #885ca4; + } + #calltoaction ul li:hover:first-child a { + background: url(../images/cta-buttons.jpg) bottom left no-repeat #ff9800; + } + #calltoaction ul li:last-child a:link, + #calltoaction ul li:last-child a:visited, + #calltoaction ul li:hover:last-child a { + -webkit-border-top-right-radius: 7px; + -webkit-border-bottom-right-radius: 7px; + -moz-border-radius-topright: 7px; + -moz-border-radius-bottomright: 7px; + border-top-right-radius: 7px; + border-bottom-right-radius: 7px; + } + + #calltoaction ul li:last-child a:link, + #calltoaction ul li:last-child a:visited { + background: url(../images/cta-buttons.jpg) top right no-repeat #885ca4; + color: #FFFFFF; + } + + #calltoaction ul li:hover:last-child a { + background: url(../images/cta-buttons.jpg) bottom right no-repeat #ff9800; + } + + /* BANNER ------------*/ #banner { @@ -495,17 +490,18 @@ .smartphone24, .sourcecode24 { display: block; - line-height: 34px; + line-height: 32px; padding: 0px 0 0px 33px; } .accordionButton { - background: url("../images/table-head.jpg") repeat-x scroll left top #885CA4; + background: url("../images/table-title.jpg") repeat-x left bottom #885CA4; color: #FFFFFF; margin: 0; padding-left: 10px; font-size: 1.1em; font-weight: bold; + height: 32px; width: 700px; float: left; _float: none; /* Float works in all browsers but IE6 */ @@ -532,6 +528,10 @@ display: block; } +.accordionContent .fauxhead { + width: 710px; + } + .package { float: left; width: 668px; @@ -1025,7 +1025,7 @@ .dbox.donate ul.amounts li { display: inline-block; - margin-left: 20px; + margin-left: 15px; } .dbox.donate ul.amounts li label { Modified: website/trunk/donate/en/donate.wml =================================================================== --- website/trunk/donate/en/donate.wml 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/donate/en/donate.wml 2011-08-29 18:50:48 UTC (rev 24977) @@ -29,7 +29,7 @@ </ul> If you want to make an anonymous donation, please do so in an anonymous way. Contact us at donations(a)torproject.org for more details.  -<script type="text/javascript" src="$(DOCROOT)/jquery.min.js"></script> +<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js"></script> <script type="text/javascript"> function displayVals() { var t3 = jQuery('#t3').val(); @@ -117,8 +117,8 @@ <input type="hidden" id="cmd" name="cmd" value="_donations"> <input type="hidden" name="business" value="donations(a)torproject.org"> <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou"> - <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/donate/donate.html"> </div> </form> </div> @@ -142,10 +142,10 @@ <input type="hidden" name="isDonationWidget" value="1"> <input type="hidden" name="description" value="Supporting Online Anonymity & Privacy"> <input type="hidden" name="amazonPaymentsAccountId" value="XGSROLNTXRNC3N1P4TXKMNK14LN1D6SZUD8SN1"> - <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/donate/thankyou"> + <input type="hidden" name="returnUrl" value="https://www.torproject.org/donate/thankyou.html"> <input type="hidden" name="processImmediate" value="1"> <input type="hidden" name="cobrandingStyle" value="logo"> - <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate"> + <input type="hidden" name="abandonUrl" value="https://www.torproject.org/donate/donate.html"> </div> </form> Requires an Amazon Account Modified: website/trunk/donate/en/thankyou-head.wmi =================================================================== --- website/trunk/donate/en/thankyou-head.wmi 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/donate/en/thankyou-head.wmi 2011-08-29 18:50:48 UTC (rev 24977) @@ -36,8 +36,8 @@ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> <meta name="author" content="The Tor Project, Inc."> <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> -<script type="text/javascript" src="$(DOCROOT)/jquery.min.js" charset="utf-8"></script> -<script type="text/javascript" src="$(DOCROOT)/jquery.infieldlabel.min.js" charset="utf-8"></script> +<script type="text/javascript" src="$(DOCROOT)/js/jquery.min.js" charset="utf-8"></script> +<script type="text/javascript" src="$(DOCROOT)/js/jquery.infieldlabel.min.js" charset="utf-8"></script> <script type="text/javascript" charset="utf-8"> /* email placeholder function */ $(function(){ $("label").replaceWith('<label class="active" for="email">Enter your email address</label>'); $("label").inFieldLabels(); }); Modified: website/trunk/download/en/download.wml =================================================================== --- website/trunk/download/en/download.wml 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/download/en/download.wml 2011-08-29 18:50:48 UTC (rev 24977) @@ -1,10 +1,10 @@ ## translation metadata # Revision: $Revision$ # Translation-Priority: 3-low -#include "head.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" +#include "dlhead.wmi" TITLE="Download Tor" CHARSET="UTF-8" ANNOUNCE_RSS="yes" # -# +# # # @@ -313,6 +313,35 @@  <div id="sidecol-right">  + <script async type="text/javascript"> + function displayVals() { + var t3 = $("#t3").val(); + var amount = $("#amount").val(); + if(t3 != 0){ + $('#a3').val(amount); + $('#p3').val(1); + $('#cmd').val('_xclick-subscriptions'); + $('#item_name').val('Tor Project Membership'); + $('#ppinfo').replaceWith('<h6 id="ppinfo">(Requires a PayPal Account)</h6>'); + }else{ + $('#a3').val(0); + $('#p3').val(0); + $('#cmd').val('_donations'); + $('#item_name').val('Donation to the Tor Project'); + $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + if( !t3 ) { + $('#cmd').val('_donations'); + $('#item_name').val('Donation to the Tor Project'); + $('#ppinfo').replaceWith('<h6 id="ppinfo" style="height:0px;"></h6>'); + } + } + $(function(){ + $("#amount").change(displayVals); + $("#t3").change(displayVals); + displayVals(); + }); + </script> <form class="dbox dl" action="https://www.paypal.com/cgi-bin/webscr" method="post"> <h2>Donate to Tor</h2> @@ -340,8 +369,8 @@ <input type="hidden" id="cmd" name="cmd" value="_donations"> <input type="hidden" name="business" value="donations(a)torproject.org"> <input type="hidden" id="item_name" name="item_name" value="Donation to the Tor Project"> - <input type="hidden" name="return" value="<page donate/thankyou>"> - <input type="hidden" name="cancel_return" value="<page download/download>"> + <input type="hidden" name="return" value="https://www.torproject.org/donate/thankyou.html"> + <input type="hidden" name="cancel_return" value="https://www.torproject.org/download/download.html"> <h6 id="ppinfo" style="height:0px;"></h6> Deleted: website/trunk/download/en/head.wmi =================================================================== --- website/trunk/download/en/head.wmi 2011-08-29 02:37:19 UTC (rev 24976) +++ website/trunk/download/en/head.wmi 2011-08-29 18:50:48 UTC (rev 24977) @@ -1,197 +0,0 @@ -#! /usr/bin/wml -<: use strict; :> -<: use warnings; :> -#use "perl-globals.wmi" -#use "links.wmi" -#use "versions.wmi" -#use "navigation.wmi" - -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd"> -<html> -<head> - <title>$(TITLE)</title> - <link rel="shortcut icon" type="image/x-icon" href="$(IMGROOT)/favicon.ico"> - <ifneq "$(REDIRECT)" "" "<meta http-equiv="refresh" content="0;url=$(DOCROOT)/$(REDIRECT)">"> - <ifneq "$(REDIRECT_GLOBAL)" "" "<meta http-equiv="refresh" content="0;url=$(REDIRECT_GLOBAL)">"> - <ifeq "$(ANNOUNCE_RSS)" "yes" "<link rel="alternate" title="Tor Project OR-announce" href="http://rss.gmane.org/gmane.network.onion-routing.announce" -type="application/rss+xml">"> - - # begin WML to generate css/js paths - <ifneq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/$(STYLESHEET)">"> - <ifeq "$(STYLESHEET)" "" "<link rel="stylesheet" type="text/css" href="$(DOCROOT)/css/master.css">"> - - #<link href="css/master.css" rel="stylesheet" type="text/css"> -  -  -  - -# <script language="javascript" type="text/javascript" src="$(DOCROOT)/global.js"></script> - # end WML to generate css/js paths - - <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> - <meta name="author" content="The Tor Project, Inc."> - <meta name="keywords" content="anonymity online, tor, tor project, censorship circumvention, traffic analysis, anonymous communications research"> - <script type="text/javascript" src="../js/jquery.min.js"> -#/* jQuery */ - </script> - <script type="text/javascript" src="../js/jquery.client.min.js"> -/* "jQuery Browser And OS Detection Plugin" by Stoiman - Source: http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug… - License: Public Domain (http://www.stoimen.com/blog/2009/07/16/jquery-browser-and-os-detection-plug…) */ - </script> - <script type="text/javascript" src="../js/dlpage01.js"> -#/* Displays detected section */ - </script> - <script async type="text/javascript" src="../js/jquery.accordion.min.js"> -/* Modified version of "Stupid Simple jQuery Accordian Menu" originally developed by Ryan Stemkoski - Source: http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/ - License: Public Domain (http://www.stemkoski.com/stupid-simple-jquery-accordion-menu/#comment-32882) */ - </script> - <script async type="text/javascript"> -#/* switches package links depending on selection */ - function updateLang() { - var caller = $( this ); - var pkg = caller.attr('id'); - var lang = caller.val(); - var wintbb = '../dist/torbrowser/tor-browser-<version-torbrowserbundle>_'+lang+'.exe'; - var osxtbb = '../dist/torbrowser/osx/TorBrowser-<version-torbrowserbundleosx>-dev-osx-i386-'+lang+'.zip'; - var lintbb32 = '../dist/torbrowser/linux/tor-browser-gnu-linux-i686-<version-torbrowserbundlelinux32>-dev-'+lang+'.tar.gz'; - var lintbb64 = '../dist/torbrowser/linux/tor-browser-gnu-linux-x86_64-<version-torbrowserbundlelinux64>-dev-'+lang+'.tar.gz'; - if(pkg == 'win-tbb'){ - $('.'+pkg).replaceWith('<a class="button win-tbb" href="'+wintbb+'">DownloadTor Browser Bundle</a>'); - $('.'+pkg+'-sig').replaceWith('<a class="win-tbb-sig" href="'+wintbb+'.asc">sig</a>'); - }else if(pkg == 'osx-tbb'){ - $('.'+pkg).replaceWith('<a class="button osx-tbb" href="'+osxtbb+'">DownloadTor Browser Bundle (Beta)</a>'); - $('.'+pkg+'-sig').replaceWith('<a class="osx-tbb-sig" href="'+osxtbb+'.asc">sig</a>'); - }else if(pkg == 'lin-tbb32'){ - $('.'+pkg).replaceWith('<a class="button lin-tbb32" href="'+lintbb32+'">Downloadi686 / 32-bit (Beta)</a>'); - $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb32-sig" href="'+lintbb32+'.asc">sig</a>'); - }else if(pkg == 'lin-tbb64'){ - $('.'+pkg).replaceWith('<a class="button lin-tbb64" href="'+lintbb64+'">Downloadx86_64 / 64-bit (Beta)</a>'); - $('.'+pkg+'-sig').replaceWith('<a class="lin-tbb64-sig" href="'+lintbb64+'.asc">sig</a>'); - } - } - - $(function(){ - $('.lang').ready(updateLang); - $('.lang').change(updateLang); - /* Only show language selector if javascript is enabled */ - $('.lang').css('display', 'block'); - }); - </script> - <script async type="text/javascript" src="../js/ppwidget.js"> -#/* Script For Donation Widget */ - </script> -</head> -<body onload="resetAll()" onunload=""> -<div id="wrap"> - <div id="header"> - <h1 id="logo"><a href="<page index>">Tor</a></h1> - # navigation menu generation - <div id="nav"> - <ul> - <:{ - # create a hash and maintain order of keys - my %navigation; - my @keys; - while (@navigation) { - my $key = shift @navigation; - my $val = shift @navigation; - push @keys, $key; - $navigation{$key} = $val; - } - - my $page = $WML_SRC_BASENAME; - my $lang = "$(LANG)"; - - for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - - # in directory of active link, set class active - my $class; - if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { - $class = 'class="active"'; - } else { - $class = ''; - } - - $dir = '.' unless defined $dir; - - # translated version - if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { - printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$navigation{$key}; - } - # english version - elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { - printf '<li><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $navigation{$key}; - } - # full url - elsif ($key =~/^http/) { - printf '<li><a href="%s">%s</a></li>'."\n", $key, $navigation{$key}; - } else { - warn "$WML_SRC_FILENAME has a [page $key] (parses to -docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; - } - } - }:> - </ul> - </div> -  - # end navigation generation - <div id="calltoaction"> - <ul> - <:{ - my %calltoaction; - my @keys; - while (@calltoaction) { - my $key = shift @calltoaction; - my $val = shift @calltoaction; - push @keys, $key; - $calltoaction{$key} = $val; - } - - my $page = $WML_SRC_BASENAME; - my $lang = "$(LANG)"; - for my $key (@keys) { - my ($dir, $base) = $key =~ m,^(?:(.*)/)?(.*?)$,; - - # in directory, set active - my $class; - if ((defined $dir) and ($WML_SRC_DIRNAME =~/$dir/) or ($WML_SRC_BASENAME eq $base)) { - #if ($WML_SRC_BASENAME eq $base) { - $class = 'class="active"'; - } else { - $class = ''; - } - - $dir = '.' unless defined $dir; - # try to use a translated version - if (-e "$(DOCROOT)/$dir/$lang/$base.wml") { - printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html.$(LANG)"),$calltoaction{$key}; - } - # default to english version - elsif (-e "$(DOCROOT)/$dir/en/$base.wml") { - printf '<li class="donate"><a '.$class.' href="%s">%s</a></li>'."\n", - stripDotSlashs("$(DOCROOT)/$dir/$base.html"), $calltoaction{$key}; - } else { - warn "$WML_SRC_FILENAME has a [page $key] (parses to docdir: $(DOCROOT)/; dir: $dir; base: $base -> $(DOCROOT)/$dir/$lang/$base.wml), but that doesn't exist."; - } - } - }:> - </ul> - </div> -  - </div> -  - -#<ifneq "$(REDIRECT)" "" "Redirecting to <a href="$(DOCROOT)/$(REDIRECT)">$(DOCROOT)/$(REDIRECT)</a>."> -#<ifneq "$(REDIRECT_GLOBAL)" "" "Redirecting to <a href="$(REDIRECT_GLOBAL)">$(REDIRECT_GLOBAL)</a>."> Deleted: website/trunk/js/ppwidget.js =================================================================== (Binary files differ)

1 0

[tor/master] Fix compilation on non-bufferevent systems after 3803 fix: oops.
by nickm＠torproject.org 29 Aug '11

29 Aug '11

commit cdbfc2a0c26fbe4cc3348babf3b92fb1ae931dec Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Aug 29 13:41:59 2011 -0400 Fix compilation on non-bufferevent systems after 3803 fix: oops. --- src/or/connection.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/src/or/connection.c b/src/or/connection.c index 23546f0..7615952 100644 --- a/src/or/connection.c +++ b/src/or/connection.c @@ -2223,6 +2223,7 @@ record_num_bytes_transferred_impl(connection_t *conn, rep_hist_note_exit_bytes(conn->port, num_written, num_read); } +#ifdef USE_BUFFEREVENTS /** DOCDOC */ static void record_num_bytes_transferred(connection_t *conn, @@ -2242,6 +2243,7 @@ record_num_bytes_transferred(connection_t *conn, record_num_bytes_transferred_impl(conn,now,num_read,num_written); } +#endif #ifndef USE_BUFFEREVENTS /** We just read num_read and wrote num_written bytes @@ -2261,7 +2263,7 @@ connection_buckets_decrement(connection_t *conn, time_t now, tor_fragile_assert(); } - record_num_bytes_transferred_(conn, now, num_read, num_written); + record_num_bytes_transferred_impl(conn, now, num_read, num_written); if (!connection_is_rate_limited(conn)) return; /* local IPs are free */

1 0