March 2016 - tor-commits - lists.torproject.org

[webwml/master] Nyx subtask for improving event dialog
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit 055b7856191b9bcc54b6d6c48f893a26320ff623 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 7 19:35:12 2016 -0800 Nyx subtask for improving event dialog Another subtask that came to mind and would make an interesting item for this project. --- getinvolved/en/volunteer.wml | 1 + 1 file changed, 1 insertion(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index bdfa9a5..8b6c894 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -990,6 +990,7 @@ get ya started... <li>Unit testing! Nyx has <a href="https://gitweb.torproject.org/nyx.git/tree/test">started adding tests</a> but it's still very minimal. Achieving any substantial code coverage will require us to figure out how to unit test curses components.</li> <li>Onionoo provides additional relay information that could enrich our connection panel such as geoip and rdns. Trick is that at present we can only query it on a per-relay basis which would leak our connections (no-go for security). However, if we could get information about all relays in bulk it would sidestep this. For some old thoughts on this see <a href="https://trac.torproject.org/projects/tor/wiki/doc/arm#CircuitDetails">here</a>.</li> <li>Relay setup wizard. Our last release had this (screenshots: <a href="https://www.atagar.com/transfer/tmp/arm_wizard1.png">1</a>, <a href="https://www.atagar.com/transfer/tmp/arm_wizard2.png">2</a>, <a href="https://www.atagar.com/transfer/tmp/arm_wizard3.png">3</a>). This has been removed because including it directly in Nyx confused users, but we might want to resurrect it as a separate setup-tor-relay command.</li> + <li><a href="https://trac.torproject.org/projects/tor/ticket/18499">Improved dialog</a> for selecting events to log.</li> <li>... and more! Again, don't hesitate to propose ideas of your own.</li> </ul>

1 0

[webwml/master] Add 'Let's Encrypt Client' project idea
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit cb194f00b056f332a670258a4ca6842b7d3c0879 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 7 18:49:27 2016 -0800 Add 'Let's Encrypt Client' project idea Project idea from the EFF. --- getinvolved/en/volunteer.wml | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/getinvolved/en/volunteer.wml b/getinvolved/en/volunteer.wml index 21f199e..bdfa9a5 100644 --- a/getinvolved/en/volunteer.wml +++ b/getinvolved/en/volunteer.wml @@ -1352,6 +1352,41 @@ implementation. </ul> </li> + <a id="letsEncryptClient"></a> + <li> + Expand the OS and Server Support of the Let's Encrypt Client + + Language: Python, Bash + + Likely Mentors: Brad Warren (bmw) + + + <a href="https://letsencrypt.org/">Let's Encrypt</a> is a free and open + certificate authority that allows its users to setup HTTPS on their web + server in a matter of seconds. The project uses a new protocol called ACME + to automatically perform domain validation and certificate issuance. + + + + The Let's Encrypt client currently works on most Unix-like OSes and is + able to automatically set up HTTPS on many Apache configurations. The + purpose of this project is to expand Let's Encrypt support to new + systems. + + + + Potential targets include: + + + <ul> + <li>Better OS X support including a port or Homebrew package</li> + <li>A Let's Encrypt client for Windows / IIS</li> + <li>Handling of more obscure Apache configurations</li> + <li>Automated HTTPS configuration for other web servers such as Nginx or lighttpd</li> + <li>Improved support people using shared hosting who are unable to use the full Let's Encrypt client on their server</li> + </ul> + </li> + <a id="ahmiaSearch"></a> <li> Ahmia - Hidden Service Search

1 0

[nyx/master] Expand relative tor log paths
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit 44f8a618b145dc371b751f1d37e74a8fff258168 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 7 13:24:03 2016 -0800 Expand relative tor log paths We have an expand_path() helper so why not use it? We should now expand relative tor log paths. --- nyx/util/log.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/nyx/util/log.py b/nyx/util/log.py index f9c95cc..6c5a7b6 100644 --- a/nyx/util/log.py +++ b/nyx/util/log.py @@ -25,7 +25,6 @@ except ImportError: TOR_RUNLEVELS = ['DEBUG', 'INFO', 'NOTICE', 'WARN', 'ERR'] TIMEZONE_OFFSET = time.altzone if time.localtime()[8] else time.timezone -CONFIG = stem.util.conf.config_dict('nyx', {'tor.chroot': ''}) def day_count(timestamp): @@ -55,7 +54,7 @@ def log_file_path(controller): entry_comp = log_entry.split() # looking for an entry like: notice file /var/log/tor/notices.log if entry_comp[1] == 'file': - return CONFIG['tor.chroot'] + entry_comp[2] + return nyx.util.expand_path(entry_comp[2]) @lru_cache()

1 0

[nyx/master] Drop tor.password nyxrc option
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit d3a0279eddd15559739846d723e54b3b16aa2fd0 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 7 16:49:34 2016 -0800 Drop tor.password nyxrc option Tor offers two authentication options: cookie and password. The former is access to a file on disk while the later is something the user knows. By allowing users to specify a nyxrc line with the password it's no better than cookie auth, so we should encourage that. --- nyx/starter.py | 12 ------------ nyxrc.sample | 1 - 2 files changed, 13 deletions(-) diff --git a/nyx/starter.py b/nyx/starter.py index 6a88912..81a892f 100644 --- a/nyx/starter.py +++ b/nyx/starter.py @@ -68,7 +68,6 @@ def main(config): controller = init_controller( control_port = control_port, control_socket = control_socket, - password = config.get('tor.password', None), password_prompt = True, chroot_path = config.get('tor.chroot', ''), ) @@ -80,7 +79,6 @@ def main(config): _warn_if_unable_to_get_pid(controller) _setup_freebsd_chroot(controller) _notify_of_unknown_events() - _clear_password() _use_english_subcommands() _use_unicode() _set_process_name() @@ -215,16 +213,6 @@ def _notify_of_unknown_events(): log.info('setup.unknown_event_types', event_types = ', '.join(missing_events)) -@uses_settings -def _clear_password(config): - """ - Removing the reference to our controller password so the memory can be freed. - Without direct memory access this is about the best we can do to clear it. - """ - - config.set('tor.password', None) - - def _use_english_subcommands(): """ Make subcommands we run (ps, netstat, etc) provide us with English results. diff --git a/nyxrc.sample b/nyxrc.sample index 160ce68..612af6b 100644 --- a/nyxrc.sample +++ b/nyxrc.sample @@ -1,5 +1,4 @@ # Startup options -tor.password startup.events N3 startup.dataDirectory ~/.nyx

1 0

[nyx/master] Header docs for our log.py util
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit 84a72df3ef57231fc6cc423f338b9c451f203df4 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 7 13:42:58 2016 -0800 Header docs for our log.py util Standard header summary for the functions provided by this module. --- nyx/util/log.py | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/nyx/util/log.py b/nyx/util/log.py index 6c5a7b6..bf9fe82 100644 --- a/nyx/util/log.py +++ b/nyx/util/log.py @@ -1,6 +1,39 @@ """ Logging utilities, primiarily short aliases for logging a message at various runlevels. + +:: + + trace - logs a message at the TRACE runlevel + debug - logs a message at the DEBUG runlevel + info - logs a message at the INFO runlevel + notice - logs a message at the NOTICE runlevel + warn - logs a message at the WARN runlevel + error - logs a message at the ERROR runlevel + + day_count - number of days since a given timestamp + log_file_path - path of tor's log file if one is present on disk + condense_runlevels - condensed displayable listing of log events + listen_for_events - notifies listener of tor events + read_tor_log - provides LogEntry from a tor log file + + LogGroup - thread safe, deduplicated grouping of events + |- add - adds an event to the group + +- pop - removes and returns an event + + LogEntry - individual log event + |- is_duplicate_of - checks if a duplicate message of another LogEntry + +- day_count - number of days since this even occured + + LogFileOutput - writes log events to a file + +- write - persist a given message + + LogFilters - regex filtering of log events + |- select - filters by this regex + |- selection - current regex filter + |- latest_selections - past regex selections + |- match - checks if a LogEntry matches this filter + +- clone - deep clone of this LogFilters """ import collections

1 0

[nyx/master] Drop torConfigDesc.txt
by atagar＠torproject.org 08 Mar '16

08 Mar '16

commit 77bb4e00098586698d897438f081b4781df722dd Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 7 16:52:59 2016 -0800 Drop torConfigDesc.txt Unused file. This was fallback tor manual information but stem now provides this. --- README | 1 - nyx/resources/torConfigDesc.txt | 1123 --------------------------------------- 2 files changed, 1124 deletions(-) diff --git a/README b/README index 8b79069..fb59185 100644 --- a/README +++ b/README @@ -170,7 +170,6 @@ Layout: version.py - version and last modified information test.py - method for starting tests and demos settings.cfg - attributes loaded for parsing tor related data - torConfigDesc.txt - fallback descriptions of Tor's configuration options uninstall - removal script cli/ diff --git a/nyx/resources/torConfigDesc.txt b/nyx/resources/torConfigDesc.txt deleted file mode 100644 index 9fa83e0..0000000 --- a/nyx/resources/torConfigDesc.txt +++ /dev/null @@ -1,1123 +0,0 @@ -Tor Version 0.2.2.13-alpha -General -index: 46 -acceldir -DIR -Specify this option if using dynamic hardware acceleration and the engine implementation library resides somewhere other than the OpenSSL default. --------------------------------------------------------------------------------- -General -index: 45 -accelname -NAME -When using OpenSSL hardware crypto acceleration attempt to load the dynamic engine of this name. This must be used for any dynamic hardware engine. Names can be verified with the openssl engine command. --------------------------------------------------------------------------------- -Relay -index: 119 -accountingmax -N bytes|KB|MB|GB|TB -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 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". --------------------------------------------------------------------------------- -Relay -index: 120 -accountingstart -day|week|month [day] HH:MM -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".) --------------------------------------------------------------------------------- -Relay -index: 104 -address -address -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. --------------------------------------------------------------------------------- -Client -index: 89 -allowdotexit -0|1 -If enabled, we convert "www.google.com.foo.exit" addresses on the SocksPort/TransPort/NatdPort into "www.google.com" addresses that exit from the node "foo". Disabled by default since attacking websites and exit relays can use it to manipulate your path selection. (Default: 0) --------------------------------------------------------------------------------- -Client -index: 51 -allowinvalidnodes -entry|exit|middle|introduction|rendezvous|... -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. --------------------------------------------------------------------------------- -Client -index: 88 -allownonrfc953hostnames -0|1 -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) --------------------------------------------------------------------------------- -Relay -index: 105 -allowsinglehopexits -0|1 -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. (Default: 0) --------------------------------------------------------------------------------- -General -index: 20 -alternatebridgeauthority -[nickname] [flags] address:port fingerprint -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. --------------------------------------------------------------------------------- -General -index: 18 -alternatedirauthority -[nickname] [flags] address:port fingerprint - --------------------------------------------------------------------------------- -General -index: 19 -alternatehsauthority -[nickname] [flags] address:port fingerprint - --------------------------------------------------------------------------------- -Relay -index: 106 -assumereachable -0|1 -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. --------------------------------------------------------------------------------- -Authority -index: 154 -authdirbaddir -AddressPattern... -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. --------------------------------------------------------------------------------- -Authority -index: 155 -authdirbadexit -AddressPattern... -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. --------------------------------------------------------------------------------- -Authority -index: 156 -authdirinvalid -AddressPattern... -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. --------------------------------------------------------------------------------- -Authority -index: 158 -authdirlistbaddirs -0|1 -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.) --------------------------------------------------------------------------------- -Authority -index: 159 -authdirlistbadexits -0|1 -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.) --------------------------------------------------------------------------------- -Authority -index: 161 -authdirmaxserversperaddr -NUM -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) --------------------------------------------------------------------------------- -Authority -index: 162 -authdirmaxserversperauthaddr -NUM -Authoritative directories only. Like AuthDirMaxServersPerAddr, but applies to addresses shared with directory authorities. (Default: 5) --------------------------------------------------------------------------------- -Authority -index: 157 -authdirreject -AddressPattern... -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. --------------------------------------------------------------------------------- -Authority -index: 160 -authdirrejectunlisted -0|1 -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) --------------------------------------------------------------------------------- -Directory -index: 135 -authoritativedirectory -0|1 -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 tor-ops(a)torproject.org if you think you should be a directory. --------------------------------------------------------------------------------- -Client -index: 95 -automaphostsonresolve -0|1 -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). --------------------------------------------------------------------------------- -Client -index: 96 -automaphostssuffixes -SUFFIX,SUFFIX,... -A comma-separated list of suffixes to use with AutomapHostsOnResolve. The "." suffix is equivalent to "all addresses." (Default: .exit,.onion). --------------------------------------------------------------------------------- -General -index: 47 -avoiddiskwrites -0|1 -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) --------------------------------------------------------------------------------- -General -index: 1 -bandwidthburst -N bytes|KB|MB|GB -Limit the maximum token bucket size (also known as the burst) to the given number of bytes in each direction. (Default: 10 MB) --------------------------------------------------------------------------------- -General -index: 0 -bandwidthrate -N bytes|KB|MB|GB -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. (Default: 5 MB) --------------------------------------------------------------------------------- -Client -index: 53 -bridge -IP:ORPort [fingerprint] -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. --------------------------------------------------------------------------------- -Directory -index: 144 -bridgeauthoritativedir -0|1 -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) --------------------------------------------------------------------------------- -Relay -index: 127 -bridgerecordusagebycountry -0|1 -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) --------------------------------------------------------------------------------- -Relay -index: 107 -bridgerelay -0|1 -Sets the relay to act as a "bridge" with respect to relaying connections from bridge users to the Tor network. Mainly it influences how the relay will cache and serve directory information. Usually used in combination with PublishServerDescriptor. --------------------------------------------------------------------------------- -Relay -index: 130 -cellstatistics -0|1 -When this option is enabled, Tor writes statistics on the mean time that cells spend in circuit queues to disk every 24 hours. Cannot be changed while Tor is running. (Default: 0) --------------------------------------------------------------------------------- -Client -index: 54 -circuitbuildtimeout -NUM -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.) --------------------------------------------------------------------------------- -Client -index: 55 -circuitidletimeout -NUM -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.) --------------------------------------------------------------------------------- -General -index: 50 -circuitpriorityhalflife -NUM1 -If this value is set, we override the default algorithm for choosing which circuit's cell to deliver or relay next. When the value is 0, we round-robin between the active circuits on a connection, delivering one cell from each in turn. When the value is positive, we prefer delivering cells from whichever connection has the lowest weighted cell count, where cells are weighted exponentially according to the supplied CircuitPriorityHalflife value (in seconds). If this option is not set at all, we use the behavior recommended in the current consensus networkstatus. This is an advanced option; you generally shouldn't have to mess with it. (Default: not set.) --------------------------------------------------------------------------------- -Client -index: 56 -circuitstreamtimeout -NUM -If non-zero, this option overrides our internal timeout schedule for how many seconds until we detach a stream from a circuit and try a new circuit. If your network is particularly slow, you might want to set this to a number like 60. (Default: 0) --------------------------------------------------------------------------------- -Client -index: 99 -clientdnsrejectinternaladdresses -0|1 -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). --------------------------------------------------------------------------------- -Client -index: 57 -clientonly -0|1 -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) --------------------------------------------------------------------------------- -Authority -index: 152 -consensusparams -STRING -STRING is a space-separated list of key=value pairs that Tor will include in the "params" line of its networkstatus vote. --------------------------------------------------------------------------------- -General -index: 7 -constrainedsockets -0|1 -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.) --------------------------------------------------------------------------------- -General -index: 8 -constrainedsocksize -N bytes|KB -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. --------------------------------------------------------------------------------- -Relay -index: 108 -contactinfo -email_address -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. --------------------------------------------------------------------------------- -General -index: 10 -controllistenaddress -IP[:PORT] -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. --------------------------------------------------------------------------------- -General -index: 9 -controlport -Port -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. --------------------------------------------------------------------------------- -General -index: 11 -controlsocket -Path -Like ControlPort, but listens on a Unix domain socket, rather than a TCP socket. (Unix and Unix-like systems only.) --------------------------------------------------------------------------------- -General -index: 13 -cookieauthentication -0|1 -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) --------------------------------------------------------------------------------- -General -index: 14 -cookieauthfile -Path -If set, this option overrides the default location and file name for Tor's cookie file. (See CookieAuthentication above.) --------------------------------------------------------------------------------- -General -index: 15 -cookieauthfilegroupreadable -0|1|Groupname -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). --------------------------------------------------------------------------------- -General -index: 16 -datadirectory -DIR -Store working data in DIR (Default: /usr/local/var/lib/tor) --------------------------------------------------------------------------------- -Authority -index: 153 -dirallowprivateaddresses -0|1 -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. --------------------------------------------------------------------------------- -Directory -index: 147 -dirlistenaddress -IP[:PORT] -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. --------------------------------------------------------------------------------- -Directory -index: 148 -dirpolicy -policy,policy,... -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. --------------------------------------------------------------------------------- -Directory -index: 146 -dirport -PORT -Advertise the directory service on this port. --------------------------------------------------------------------------------- -Directory -index: 136 -dirportfrontpage -FILENAME -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. --------------------------------------------------------------------------------- -Relay -index: 131 -dirreqstatistics -0|1 -When this option is enabled, Tor writes statistics on the number and response time of network status requests to disk every 24 hours. Cannot be changed while Tor is running. (Default: 0) --------------------------------------------------------------------------------- -General -index: 17 -dirserver -[nickname] [flags] address:port fingerprint -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 directo ry 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. --------------------------------------------------------------------------------- -General -index: 21 -disableallswap -0|1 -If set to 1, Tor will attempt to lock all current and future memory pages, so that memory cannot be paged out. Windows, OS X and Solaris are currently not supported. We believe that this feature works on modern Gnu/Linux distributions, and that it should work on *BSD systems (untested). This option requires that you start your Tor as root, and you should use the User option to properly reduce Tor's privileges. (Default: 0) --------------------------------------------------------------------------------- -Client -index: 98 -dnslistenaddress -IP[:PORT] -Bind to this address to listen for DNS connections. (Default: 127.0.0.1). --------------------------------------------------------------------------------- -Client -index: 97 -dnsport -PORT -If non-zero, Tor listens for UDP DNS requests on this port and resolves them anonymously. (Default: 0). --------------------------------------------------------------------------------- -Client -index: 100 -downloadextrainfo -0|1 -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). --------------------------------------------------------------------------------- -Client -index: 74 -enforcedistinctsubnets -0|1 -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) --------------------------------------------------------------------------------- -Client -index: 60 -entrynodes -node,node,... -A list of identity fingerprints, nicknames, country codes 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. --------------------------------------------------------------------------------- -Relay -index: 132 -entrystatistics -0|1 -When this option is enabled, Tor writes statistics on the number of directly connecting clients to disk every 24 hours. Cannot be changed while Tor is running. (Default: 0) --------------------------------------------------------------------------------- -Client -index: 59 -excludeexitnodes -node,node,... -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. --------------------------------------------------------------------------------- -Client -index: 58 -excludenodes -node,node,... -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) --------------------------------------------------------------------------------- -Client -index: 52 -excludesinglehoprelays -0|1 -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. (Default: 1) --------------------------------------------------------------------------------- -Client -index: 61 -exitnodes -node,node,... -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. --------------------------------------------------------------------------------- -Relay -index: 109 -exitpolicy -policy,policy,... -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: - - reject *:25 - reject *:119 - reject *:135-139 - reject *:445 - reject *:563 - reject *:1214 - reject *:4661-4666 - reject *:6346-6429 - reject *:6699 - reject *:6881-6999 - accept *:* --------------------------------------------------------------------------------- -Relay -index: 110 -exitpolicyrejectprivate -0|1 -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) --------------------------------------------------------------------------------- -Relay -index: 133 -exitportstatistics -0|1 -When this option is enabled, Tor writes statistics on the number of relayed bytes and opened stream per exit port to disk every 24 hours. Cannot be changed while Tor is running. (Default: 0) --------------------------------------------------------------------------------- -Relay -index: 134 -extrainfostatistics -0|1 -When this option is enabled, Tor includes previously gathered statistics in its extra-info documents that it uploads to the directory authorities. (Default: 0) --------------------------------------------------------------------------------- -Client -index: 101 -fallbacknetworkstatusfile -FILENAME -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). --------------------------------------------------------------------------------- -Client -index: 63 -fascistfirewall -0|1 -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. --------------------------------------------------------------------------------- -Client -index: 90 -fastfirsthoppk -0|1 -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) --------------------------------------------------------------------------------- -General -index: 22 -fetchdirinfoearly -0|1 -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) --------------------------------------------------------------------------------- -General -index: 23 -fetchdirinfoextraearly -0|1 -If set to 1, Tor will fetch directory information before other directory caches. It will attempt to download directory information closer to the start of the consensus period. Normal users should leave it off. (Default: 0) --------------------------------------------------------------------------------- -General -index: 24 -fetchhidservdescriptors -0|1 -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) --------------------------------------------------------------------------------- -General -index: 25 -fetchserverdescriptors -0|1 -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) --------------------------------------------------------------------------------- -General -index: 26 -fetchuselessdescriptors -0|1 -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) --------------------------------------------------------------------------------- -Client -index: 64 -firewallports -PORTS -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) --------------------------------------------------------------------------------- -Relay -index: 129 -geoipfile -filename -A filename containing GeoIP data, for use with BridgeRecordUsageByCountry. --------------------------------------------------------------------------------- -General -index: 44 -hardwareaccel -0|1 -If non-zero, try to use built-in (static) crypto hardware acceleration when available. (Default: 0) --------------------------------------------------------------------------------- -General -index: 12 -hashedcontrolpassword -hashed_password -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. --------------------------------------------------------------------------------- -Hidden Service -index: 171 -hiddenserviceauthorizeclient -auth-type client-name,client-name,... -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. --------------------------------------------------------------------------------- -Hidden Service -index: 167 -hiddenservicedir -DIRECTORY -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. --------------------------------------------------------------------------------- -Hidden Service -index: 168 -hiddenserviceport -VIRTPORT [TARGET] -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. --------------------------------------------------------------------------------- -Hidden Service -index: 170 -hiddenserviceversion -version,version,... -A list of rendezvous service descriptor versions to publish for the hidden service. Currently, only version 2 is supported. (Default: 2) --------------------------------------------------------------------------------- -Client -index: 65 -hidservauth -onion-address auth-cookie [service-name] -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. --------------------------------------------------------------------------------- -Directory -index: 143 -hidservdirectoryv2 -0|1 -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) --------------------------------------------------------------------------------- -Directory -index: 142 -hsauthoritativedir -0|1 -When this option is set in addition to AuthoritativeDirectory, Tor also accepts and serves hidden service descriptors. (Default: 0) --------------------------------------------------------------------------------- -General -index: 27 -httpproxy -host[:port] -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. --------------------------------------------------------------------------------- -General -index: 28 -httpproxyauthenticator -username:password -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. --------------------------------------------------------------------------------- -General -index: 29 -httpsproxy -host[:port] -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. --------------------------------------------------------------------------------- -General -index: 30 -httpsproxyauthenticator -username:password -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. --------------------------------------------------------------------------------- -General -index: 35 -keepaliveperiod -NUM -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) --------------------------------------------------------------------------------- -General -index: 37 -log -minSeverity[-maxSeverity] file FILENAME -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. --------------------------------------------------------------------------------- -Client -index: 69 -longlivedports -PORTS -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) --------------------------------------------------------------------------------- -Client -index: 70 -mapaddress -address newaddress -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". --------------------------------------------------------------------------------- -General -index: 2 -maxadvertisedbandwidth -N bytes|KB|MB|GB -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. --------------------------------------------------------------------------------- -Client -index: 72 -maxcircuitdirtiness -NUM -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) --------------------------------------------------------------------------------- -Relay -index: 111 -maxonionspending -NUM -If you have more than this number of onionskins queued for decrypt, reject new ones. (Default: 100) --------------------------------------------------------------------------------- -Directory -index: 145 -minuptimehidservdirectoryv2 -N seconds|minutes|hours|days|weeks -Minimum uptime of a v2 hidden service directory to be accepted as such by authoritative directories. (Default: 24 hours) --------------------------------------------------------------------------------- -Relay -index: 112 -myfamily -node,node,... -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.) --------------------------------------------------------------------------------- -Directory -index: 141 -namingauthoritativedirectory -0|1 -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. --------------------------------------------------------------------------------- -Client -index: 94 -natdlistenaddress -IP[:PORT] -Bind to this address to listen for NATD connections. (Default: 127.0.0.1). --------------------------------------------------------------------------------- -Client -index: 93 -natdport -PORT -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. --------------------------------------------------------------------------------- -Client -index: 71 -newcircuitperiod -NUM -Every NUM seconds consider whether to build a new circuit. (Default: 30 seconds) --------------------------------------------------------------------------------- -Relay -index: 113 -nickname -name -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]. --------------------------------------------------------------------------------- -Client -index: 73 -nodefamily -node,node,... -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. --------------------------------------------------------------------------------- -Relay -index: 114 -numcpus -num -How many processes to use at once for decrypting onionskins. (Default: 1) --------------------------------------------------------------------------------- -Client -index: 84 -numentryguards -NUM -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.) --------------------------------------------------------------------------------- -Relay -index: 116 -orlistenaddress -IP[:PORT] -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. --------------------------------------------------------------------------------- -Relay -index: 115 -orport -PORT -Advertise this port to listen for connections from Tor clients and servers. --------------------------------------------------------------------------------- -General -index: 38 -outboundbindaddress -IP -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). --------------------------------------------------------------------------------- -General -index: 6 -perconnbwburst -N bytes|KB|MB|GB -If set, do separate rate limiting for each connection from a non-relay. You should never need to change this value, since a network-wide value is published in the consensus and your relay will use that value. (Default: 0) --------------------------------------------------------------------------------- -General -index: 5 -perconnbwrate -N bytes|KB|MB|GB -If set, do separate rate limiting for each connection from a non-relay. You should never need to change this value, since a network-wide value is published in the consensus and your relay will use that value. (Default: 0) --------------------------------------------------------------------------------- -General -index: 39 -pidfile -FILE -On startup, write our PID to FILE. On clean shutdown, remove FILE. --------------------------------------------------------------------------------- -General -index: 49 -prefertunneleddirconns -0|1 -If non-zero, we will avoid directory servers that don't support tunneled directory connections, when possible. (Default: 1) --------------------------------------------------------------------------------- -General -index: 40 -protocolwarnings -0|1 -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) --------------------------------------------------------------------------------- -Hidden Service -index: 169 -publishhidservdescriptors -0|1 -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) --------------------------------------------------------------------------------- -Relay -index: 117 -publishserverdescriptor -0|1|v1|v2|v3|bridge|hidserv,... -This option is only considered if you have an ORPort defined. You can choose multiple arguments, separated by commas. If set to 0, Tor will act as a server but it will not publish its descriptor to the directory authorities. (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 descriptor to all directory authorities of the type(s) specified. The value "1" is the default, which means "publish to the appropriate authorities". --------------------------------------------------------------------------------- -Client -index: 66 -reachableaddresses -ADDR[/MASK][:PORT]... -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 *:*'.) --------------------------------------------------------------------------------- -Client -index: 67 -reachablediraddresses -ADDR[/MASK][:PORT]... -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. --------------------------------------------------------------------------------- -Client -index: 68 -reachableoraddresses -ADDR[/MASK][:PORT]... -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. --------------------------------------------------------------------------------- -Authority -index: 150 -recommendedclientversions -STRING -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. --------------------------------------------------------------------------------- -Authority -index: 151 -recommendedserverversions -STRING -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. --------------------------------------------------------------------------------- -Authority -index: 149 -recommendedversions -STRING -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. --------------------------------------------------------------------------------- -Client -index: 103 -rejectplaintextports -port,port,... -Like WarnPlaintextPorts, but instead of warning about risky port uses, Tor will instead refuse to make the connection. (Default: None). --------------------------------------------------------------------------------- -General -index: 4 -relaybandwidthburst -N bytes|KB|MB|GB -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) --------------------------------------------------------------------------------- -General -index: 3 -relaybandwidthrate -N bytes|KB|MB|GB -If defined, 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) --------------------------------------------------------------------------------- -Hidden Service -index: 172 -rendpostperiod -N seconds|minutes|hours|days|weeks -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: 20 minutes) --------------------------------------------------------------------------------- -General -index: 41 -runasdaemon -0|1 -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) --------------------------------------------------------------------------------- -General -index: 42 -safelogging -0|1|relay -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. If it is set to relay, all log messages generated when acting as a relay are sanitized, but all messages generated when acting as a client are not. (Default: 1) --------------------------------------------------------------------------------- -Client -index: 85 -safesocks -0|1 -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.) --------------------------------------------------------------------------------- -Relay -index: 122 -serverdnsallowbrokenconfig -0|1 -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".) --------------------------------------------------------------------------------- -Relay -index: 126 -serverdnsallownonrfc953hostnames -0|1 -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) --------------------------------------------------------------------------------- -Relay -index: 124 -serverdnsdetecthijacking -0|1 -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".) --------------------------------------------------------------------------------- -Relay -index: 128 -serverdnsrandomizecase -0|1 -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) --------------------------------------------------------------------------------- -Relay -index: 121 -serverdnsresolvconffile -filename -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.) --------------------------------------------------------------------------------- -Relay -index: 123 -serverdnssearchdomains -0|1 -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".) --------------------------------------------------------------------------------- -Relay -index: 125 -serverdnstestaddresses -address,address,... -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".) --------------------------------------------------------------------------------- -Relay -index: 118 -shutdownwaitlength -NUM -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) --------------------------------------------------------------------------------- -General -index: 31 -socks4proxy -host[:port] -Tor will make all OR connections through the SOCKS 4 proxy at host:port (or host:1080 if port is not specified). --------------------------------------------------------------------------------- -General -index: 32 -socks5proxy -host[:port] -Tor will make all OR connections through the SOCKS 5 proxy at host:port (or host:1080 if port is not specified). --------------------------------------------------------------------------------- -General -index: 34 -socks5proxypassword -password -If defined, authenticate to the SOCKS 5 server using username and password in accordance to RFC 1929. Both username and password must be between 1 and 255 characters. --------------------------------------------------------------------------------- -General -index: 33 -socks5proxyusername -username - --------------------------------------------------------------------------------- -Client -index: 76 -sockslistenaddress -IP[:PORT] -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. --------------------------------------------------------------------------------- -Client -index: 77 -sockspolicy -policy,policy,... -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. --------------------------------------------------------------------------------- -Client -index: 75 -socksport -PORT -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) --------------------------------------------------------------------------------- -Client -index: 78 -sockstimeout -NUM -Let a socks connection wait NUM seconds handshaking, and NUM seconds unattached waiting for an appropriate circuit, before we fail it. (Default: 2 minutes.) --------------------------------------------------------------------------------- -Client -index: 62 -strictnodes -0|1 -If 1 and EntryNodes config option is set, Tor will never use any nodes besides those listed in EntryNodes for the first hop of a normal circuit. If 1 and ExitNodes config option is set, Tor will never use any nodes besides those listed in ExitNodes for the last hop of a normal exit circuit. Note that Tor might still use these nodes for non-exit circuits such as one-hop directory fetches or hidden service support circuits. --------------------------------------------------------------------------------- -Testing -index: 177 -testingauthdirtimetolearnreachability -N minutes|hours -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) --------------------------------------------------------------------------------- -Testing -index: 178 -testingestimateddescriptorpropagationtime -N minutes|hours -Clients try downloading router descriptors from directory caches after this time. Changing this requires that TestingTorNetwork is set. (Default: 10 minutes) - -SIGNALS --------------------------------------------------------------------------------- -Testing -index: 173 -testingtornetwork -0|1 -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) - - ServerDNSAllowBrokenConfig 1 - DirAllowPrivateAddresses 1 - EnforceDistinctSubnets 0 - AssumeReachable 1 - AuthDirMaxServersPerAddr 0 - AuthDirMaxServersPerAuthAddr 0 - ClientDNSRejectInternalAddresses 0 - ExitPolicyRejectPrivate 0 - V3AuthVotingInterval 5 minutes - V3AuthVoteDelay 20 seconds - V3AuthDistDelay 20 seconds - TestingV3AuthInitialVotingInterval 5 minutes - TestingV3AuthInitialVoteDelay 20 seconds - TestingV3AuthInitialDistDelay 20 seconds - TestingAuthDirTimeToLearnReachability 0 minutes - TestingEstimatedDescriptorPropagationTime 0 minutes --------------------------------------------------------------------------------- -Testing -index: 176 -testingv3authinitialdistdelay -N minutes|hours -Like TestingV3AuthInitialDistDelay, but for initial voting interval before the first consensus has been created. Changing this requires that TestingTorNetwork is set. (Default: 5 minutes) --------------------------------------------------------------------------------- -Testing -index: 175 -testingv3authinitialvotedelay -N minutes|hours -Like TestingV3AuthInitialVoteDelay, but for initial voting interval before the first consensus has been created. Changing this requires that TestingTorNetwork is set. (Default: 5 minutes) --------------------------------------------------------------------------------- -Testing -index: 174 -testingv3authinitialvotinginterval -N minutes|hours -Like V3AuthVotingInterval, but for initial voting interval before the first consensus has been created. Changing this requires that TestingTorNetwork is set. (Default: 30 minutes) --------------------------------------------------------------------------------- -Client -index: 86 -testsocks -0|1 -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) --------------------------------------------------------------------------------- -Client -index: 79 -trackhostexits -host,.domain,... -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. --------------------------------------------------------------------------------- -Client -index: 80 -trackhostexitsexpire -NUM -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). --------------------------------------------------------------------------------- -Client -index: 92 -translistenaddress -IP[:PORT] -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. --------------------------------------------------------------------------------- -Client -index: 91 -transport -PORT -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). --------------------------------------------------------------------------------- -General -index: 48 -tunneldirconns -0|1 -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) --------------------------------------------------------------------------------- -Client -index: 81 -updatebridgesfromauthority -0|1 -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) --------------------------------------------------------------------------------- -Client -index: 82 -usebridges -0|1 -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) --------------------------------------------------------------------------------- -Client -index: 83 -useentryguards -0|1 -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.) --------------------------------------------------------------------------------- -General -index: 43 -user -UID -On startup, setuid to this user and setgid to their primary group. --------------------------------------------------------------------------------- -Directory -index: 137 -v1authoritativedirectory -0|1 -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). --------------------------------------------------------------------------------- -Directory -index: 138 -v2authoritativedirectory -0|1 -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). --------------------------------------------------------------------------------- -Authority -index: 165 -v3authdistdelay -N minutes|hours -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.) --------------------------------------------------------------------------------- -Authority -index: 166 -v3authnintervalsvalid -NUM -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.) --------------------------------------------------------------------------------- -Directory -index: 139 -v3authoritativedirectory -0|1 -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). --------------------------------------------------------------------------------- -Authority -index: 164 -v3authvotedelay -N minutes|hours -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.) --------------------------------------------------------------------------------- -Authority -index: 163 -v3authvotinginterval -N minutes|hours -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) --------------------------------------------------------------------------------- -Directory -index: 140 -versioningauthoritativedirectory -0|1 -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. --------------------------------------------------------------------------------- -Client -index: 87 -virtualaddrnetwork -Address/bits -When a controller asks for a virtual (unused) address with the MAPADDRESS command, 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. --------------------------------------------------------------------------------- -Client -index: 102 -warnplaintextports -port,port,... -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).

1 0

[translation/bridgedb] Update translations for bridgedb
by translation＠torproject.org 07 Mar '16

07 Mar '16

commit eec47b94fbf18c81d286611de937f617759c0222 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Mar 7 21:45:03 2016 +0000 Update translations for bridgedb --- be/LC_MESSAGES/bridgedb.po | 348 +++++++++++++++++++++++---------------------- 1 file changed, 175 insertions(+), 173 deletions(-) diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po index aba8259..8bb4e10 100644 --- a/be/LC_MESSAGES/bridgedb.po +++ b/be/LC_MESSAGES/bridgedb.po @@ -4,19 +4,21 @@ # # Translators: # Aleh Ladutska <lad-oleg(a)yandex.ru>, 2014 +# Сілкін Станіслаў <moonblr29(a)gmail.com>, 2016 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" -"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'POT-Creation-Date: 2015-03-19 22:13+0000\n" -"PO-Revision-Date: 2015-04-19 08:23+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Belarusian (http://www.transifex.com/projects/p/torproject/language/be/)\n" +"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n" +"POT-Creation-Date: 2015-07-25 03:40+0000\n" +"PO-Revision-Date: 2016-03-07 21:31+0000\n" +"Last-Translator: Сілкін Станіслаў <moonblr29(a)gmail.com>\n" +"Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Generated-By: Babel 0.9.6\n" +"Generated-By: Babel 1.3\n" "Language: be\n" -"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" +"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n" #. TRANSLATORS: Please DO NOT translate the following words and/or phrases in #. any string (regardless of capitalization and/or punctuation): @@ -29,57 +31,182 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: lib/bridgedb/HTTPServer.py:107 +#: bridgedb/https/server.py:167 msgid "Sorry! Something went wrong with your request." -msgstr "Выбачайце! Штосьці пайшле не так пад час адпраўкі вашага запыта." +msgstr "Выбачайце! Штосьці пайшло не так падчас адпраўкі вашага запыта." -#: lib/bridgedb/strings.py:18 +#: bridgedb/https/templates/base.html:79 +msgid "Report a Bug" +msgstr "Паведамiць пра баг." + +#: bridgedb/https/templates/base.html:82 +msgid "Source Code" +msgstr "Зыходны Код" + +#: bridgedb/https/templates/base.html:85 +msgid "Changelog" +msgstr "Гісторыя зменаў" + +#: bridgedb/https/templates/base.html:88 +msgid "Contact" +msgstr "" + +#: bridgedb/https/templates/bridges.html:35 +msgid "Select All" +msgstr "Абраць Усё" + +#: bridgedb/https/templates/bridges.html:40 +msgid "Show QRCode" +msgstr "Паказаць QR-код" + +#: bridgedb/https/templates/bridges.html:52 +msgid "QRCode for your bridge lines" +msgstr "" + +#. TRANSLATORS: Please translate this into some silly way to say +#. "There was a problem!" in your language. For example, +#. for Italian, you might translate this into "Mama mia!", +#. or for French: "Sacrebleu!". :) +#: bridgedb/https/templates/bridges.html:67 +#: bridgedb/https/templates/bridges.html:125 +msgid "Uh oh, spaghettios!" +msgstr "Вой, божухна!" + +#: bridgedb/https/templates/bridges.html:68 +msgid "It seems there was an error getting your QRCode." +msgstr "Здаецца, адбылася памылка падчас атрымання Вашага QR-кода." + +#: bridgedb/https/templates/bridges.html:73 +msgid "" +"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" +" your bridge lines onto mobile and other devices." +msgstr "" + +#: bridgedb/https/templates/bridges.html:131 +msgid "There currently aren't any bridges available..." +msgstr "На дадзены момант няма даступных мастоў." + +#: bridgedb/https/templates/bridges.html:132 +#, python-format +msgid "" +" Perhaps you should try %s going back %s and choosing a different bridge " +"type!" +msgstr "Магчыма, вам трэба паспрабаваць %s вярнуцца назад %s і абраць іншы тып маста." + +#: bridgedb/https/templates/index.html:11 +#, python-format +msgid "Step %s1%s" +msgstr "Крок %s1%s" + +#: bridgedb/https/templates/index.html:13 +#, python-format +msgid "Download %s Tor Browser %s" +msgstr "Запампаваць %s Tor Browser %s" + +#: bridgedb/https/templates/index.html:25 +#, python-format +msgid "Step %s2%s" +msgstr "Крок %s2%s" + +#: bridgedb/https/templates/index.html:27 +#, python-format +msgid "Get %s bridges %s" +msgstr "" + +#: bridgedb/https/templates/index.html:36 +#, python-format +msgid "Step %s3%s" +msgstr "Крок %s3%s" + +#: bridgedb/https/templates/index.html:38 +#, python-format +msgid "Now %s add the bridges to Tor Browser %s" +msgstr "Цяпер %s дадайце масты ў Tor Browser %s" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. (These are used to insert HTML5 underlining tags, to mark accesskeys +#. for disabled users.) +#: bridgedb/https/templates/options.html:38 +#, python-format +msgid "%sJ%sust give me bridges!" +msgstr "" + +#: bridgedb/https/templates/options.html:51 +msgid "Advanced Options" +msgstr "Дадатковыя Налады" + +#: bridgedb/https/templates/options.html:86 +msgid "No" +msgstr "Не" + +#: bridgedb/https/templates/options.html:87 +msgid "none" +msgstr "" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." +#: bridgedb/https/templates/options.html:124 +#, python-format +msgid "%sY%ses!" +msgstr "%sТ%sак!" + +#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the +#. beginning of words are present in your final translation. Thanks! +#. TRANSLATORS: Please do NOT translate the word "bridge"! +#: bridgedb/https/templates/options.html:147 +#, python-format +msgid "%sG%set Bridges" +msgstr "" + +#: bridgedb/strings.py:43 msgid "[This is an automated message; please do not reply.]" msgstr "[Гэта аўтаматычнае паведамленне; каліласка, не адказвайце на яго.]" -#: lib/bridgedb/strings.py:20 +#: bridgedb/strings.py:45 msgid "Here are your bridges:" msgstr "Вось вашыя масты:" -#: lib/bridgedb/strings.py:22 +#: bridgedb/strings.py:47 #, python-format msgid "" "You have exceeded the rate limit. Please slow down! The minimum time between\n" "emails is %s hours. All further emails during this time period will be ignored." msgstr "" -#: lib/bridgedb/strings.py:25 +#: bridgedb/strings.py:50 msgid "" "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)" msgstr "" #. TRANSLATORS: Please DO NOT translate the word "BridgeDB". -#: lib/bridgedb/strings.py:28 +#: bridgedb/strings.py:53 msgid "Welcome to BridgeDB!" msgstr "Рады вітаць вас у BridgeDB!" #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE". -#: lib/bridgedb/strings.py:30 +#: bridgedb/strings.py:55 msgid "Currently supported transport TYPEs:" msgstr "" -#: lib/bridgedb/strings.py:31 +#: bridgedb/strings.py:56 #, python-format msgid "Hey, %s!" msgstr "Прывітанне, %s!" -#: lib/bridgedb/strings.py:32 +#: bridgedb/strings.py:57 msgid "Hello, friend!" msgstr "Вітаю, сябра!" -#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100 +#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90 msgid "Public Keys" msgstr "Публічныя Ключы" #. TRANSLATORS: This string will end up saying something like: #. "This email was generated with rainbows, unicorns, and sparkles #. for alice(a)example.com on Friday, 09 May, 2014 at 18:59:39." -#: lib/bridgedb/strings.py:37 +#: bridgedb/strings.py:62 #, python-format msgid "" "This email was generated with rainbows, unicorns, and sparkles\n" @@ -90,7 +217,7 @@ msgstr "Гэты імэйл быў створаны чароўнымі медз #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor". #. TRANSLATORS: Please DO NOT translate "Tor Network". -#: lib/bridgedb/strings.py:47 +#: bridgedb/strings.py:72 #, python-format msgid "" "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n" @@ -101,7 +228,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". -#: lib/bridgedb/strings.py:54 +#: bridgedb/strings.py:79 msgid "" "Some bridges with IPv6 addresses are also available, though some Pluggable\n" "Transports aren't IPv6 compatible.\n" @@ -113,7 +240,7 @@ msgstr "" #. regular, or unexciting". Like vanilla ice cream. It refers to bridges #. which do not have Pluggable Transports, and only speak the regular, #. boring Tor protocol. Translate it as you see fit. Have fun with it. -#: lib/bridgedb/strings.py:63 +#: bridgedb/strings.py:88 #, python-format msgid "" "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n" @@ -122,20 +249,20 @@ msgid "" "\n" msgstr "" -#: lib/bridgedb/strings.py:76 +#: bridgedb/strings.py:101 msgid "What are bridges?" msgstr "" -#: lib/bridgedb/strings.py:77 +#: bridgedb/strings.py:102 #, python-format msgid "%s Bridges %s are Tor relays that help you circumvent censorship." msgstr "" -#: lib/bridgedb/strings.py:82 +#: bridgedb/strings.py:107 msgid "I need an alternative way of getting bridges!" msgstr "" -#: lib/bridgedb/strings.py:83 +#: bridgedb/strings.py:108 #, python-format msgid "" "Another way to get bridges is to send an email to %s. Please note that you must\n" @@ -143,61 +270,61 @@ msgid "" "%s, %s or %s." msgstr "" -#: lib/bridgedb/strings.py:90 +#: bridgedb/strings.py:115 msgid "My bridges don't work! I need help!" -msgstr "" +msgstr "Мае масты не працуюць! Патрэбная дапамога!" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:92 +#: bridgedb/strings.py:117 #, python-format msgid "If your Tor doesn't work, you should email %s." -msgstr "" +msgstr "Калі Ваш Tor не працуе, звярніцеся па e-mail адрасе %s." #. TRANSLATORS: Please DO NOT translate "Pluggable Transports". #. TRANSLATORS: Please DO NOT translate "Tor Browser". #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:96 +#: bridgedb/strings.py:121 msgid "" "Try including as much info about your case as you can, including the list of\n" "bridges and Pluggable Transports you tried to use, your Tor Browser version,\n" "and any messages which Tor gave out, etc." msgstr "" -#: lib/bridgedb/strings.py:103 +#: bridgedb/strings.py:128 msgid "Here are your bridge lines:" msgstr "" -#: lib/bridgedb/strings.py:104 +#: bridgedb/strings.py:129 msgid "Get Bridges!" msgstr "Атрымаць масты!" -#: lib/bridgedb/strings.py:108 +#: bridgedb/strings.py:133 msgid "Please select options for bridge type:" -msgstr "Каліласка, абярыце налады для тыпу маста:" +msgstr "Калі ласка, абярыце налады для тыпу маста:" -#: lib/bridgedb/strings.py:109 +#: bridgedb/strings.py:134 msgid "Do you need IPv6 addresses?" msgstr "Ці патрэбны вам IPv6 адрасы?" -#: lib/bridgedb/strings.py:110 +#: bridgedb/strings.py:135 #, python-format msgid "Do you need a %s?" msgstr "Ці патрэбны вам %s?" -#: lib/bridgedb/strings.py:114 +#: bridgedb/strings.py:139 msgid "Your browser is not displaying images properly." msgstr "Ваш браўзэр адлюстроўвае выявы некарэктна." -#: lib/bridgedb/strings.py:115 +#: bridgedb/strings.py:140 msgid "Enter the characters from the image above..." msgstr "" -#: lib/bridgedb/strings.py:119 +#: bridgedb/strings.py:144 msgid "How to start using your bridges" msgstr "Як пачаць карыстацца мастамі" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: lib/bridgedb/strings.py:121 +#: bridgedb/strings.py:146 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -206,21 +333,21 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:126 +#: bridgedb/strings.py:151 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n" "the wizard until it asks:" msgstr "Калі выскакне даялогавае вакенца \"Сеткавыя налады Tor\" націсніце \"Наладзіць\" і кіруйцеся\nпраграмай усталёўкі пакуль яна не спытае:" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:130 +#: bridgedb/strings.py:155 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor connections\n" "to the Tor network?" msgstr "Ці блакуе ваш інтэрнэт-правайдэр злучэнне з сеткай Tor, альбо як-небудзь\nпа-іншаму цэнзуріруе яго?" #. TRANSLATORS: Please DO NOT translate "Tor". -#: lib/bridgedb/strings.py:134 +#: bridgedb/strings.py:159 msgid "" "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n" "paste the bridge lines into the text input box. Finally, click 'Connect', and\n" @@ -228,153 +355,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "Абярыце \"Так\" а затым націсніце \"Далей\". Каб наладзіць масты скаріуйце і\nўстаўце радкі мастоў у тэкставае вакенца. Потым націсніце \"Злучыцца\"\nі можаце пачынаць карыстацца браўзэрам. Калі вы сутыкнуліся з праблемамі,\nпаспрабуйце націснуць \"Дапамога\" у вакенцы \"Сеткавыя налады Tor\" каб атрымаць падтрымку." -#: lib/bridgedb/strings.py:142 +#: bridgedb/strings.py:167 msgid "Displays this message." msgstr "Адлюстраваць гэтае паведамленне." #. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the #. same non-Pluggable Transport bridges described above as being #. "plain-ol'-vanilla" bridges. -#: lib/bridgedb/strings.py:146 +#: bridgedb/strings.py:171 msgid "Request vanilla bridges." msgstr "" -#: lib/bridgedb/strings.py:147 +#: bridgedb/strings.py:172 msgid "Request IPv6 bridges." msgstr "Запытаць масты IPv6." #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: lib/bridgedb/strings.py:149 +#: bridgedb/strings.py:174 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: lib/bridgedb/strings.py:152 +#: bridgedb/strings.py:177 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" - -#: lib/bridgedb/templates/base.html:89 -msgid "Report a Bug" -msgstr "Паведамiць аб баге." - -#: lib/bridgedb/templates/base.html:92 -msgid "Source Code" -msgstr "Зыходны Код" - -#: lib/bridgedb/templates/base.html:95 -msgid "Changelog" -msgstr "" - -#: lib/bridgedb/templates/base.html:98 -msgid "Contact" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:81 -msgid "Select All" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:87 -msgid "Show QRCode" -msgstr "" - -#: lib/bridgedb/templates/bridges.html:100 -msgid "QRCode for your bridge lines" -msgstr "" - -#. TRANSLATORS: Please translate this into some silly way to say -#. "There was a problem!" in your language. For example, -#. for Italian, you might translate this into "Mama mia!", -#. or for French: "Sacrebleu!". :) -#: lib/bridgedb/templates/bridges.html:115 -#: lib/bridgedb/templates/bridges.html:175 -msgid "Uh oh, spaghettios!" -msgstr "Вой, божухна!" - -#: lib/bridgedb/templates/bridges.html:116 -msgid "It seems there was an error getting your QRCode." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:121 -msgid "" -"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy" -" your bridge lines onto mobile and other devices." -msgstr "" - -#: lib/bridgedb/templates/bridges.html:181 -msgid "There currently aren't any bridges available..." -msgstr "На дадзены момант няма даступных мастоў." - -#: lib/bridgedb/templates/bridges.html:182 -#, python-format -msgid "" -" Perhaps you should try %s going back %s and choosing a different bridge " -"type!" -msgstr "Магчыма вам трэба паспрабаваць %s вярнуцца назад %s і абраць іншы тып маста." - -#: lib/bridgedb/templates/index.html:11 -#, python-format -msgid "Step %s1%s" -msgstr "Крок %s1%s" - -#: lib/bridgedb/templates/index.html:13 -#, python-format -msgid "Download %s Tor Browser %s" -msgstr "Запампаваць %s Tor Browser %s" - -#: lib/bridgedb/templates/index.html:25 -#, python-format -msgid "Step %s2%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:27 -#, python-format -msgid "Get %s bridges %s" -msgstr "" - -#: lib/bridgedb/templates/index.html:36 -#, python-format -msgid "Step %s3%s" -msgstr "" - -#: lib/bridgedb/templates/index.html:38 -#, python-format -msgid "Now %s add the bridges to Tor Browser %s" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. (These are used to insert HTML5 underlining tags, to mark accesskeys -#. for disabled users.) -#: lib/bridgedb/templates/options.html:38 -#, python-format -msgid "%sJ%sust give me bridges!" -msgstr "" - -#: lib/bridgedb/templates/options.html:52 -msgid "Advanced Options" -msgstr "" - -#: lib/bridgedb/templates/options.html:88 -msgid "No" -msgstr "Не" - -#: lib/bridgedb/templates/options.html:89 -msgid "none" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses." -#: lib/bridgedb/templates/options.html:127 -#, python-format -msgid "%sY%ses!" -msgstr "" - -#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the -#. beginning of words are present in your final translation. Thanks! -#. TRANSLATORS: Please do NOT translate the word "bridge"! -#: lib/bridgedb/templates/options.html:151 -#, python-format -msgid "%sG%set Bridges" -msgstr ""

1 0

[stem/master] Deprecated the DescriptorDownloader's get_microdescriptors()
by atagar＠torproject.org 07 Mar '16

07 Mar '16

commit 2860a3f66bc59a8f33223980fa79046ce5dcdd0b Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 6 17:29:11 2016 -0800 Deprecated the DescriptorDownloader's get_microdescriptors() This methed never worked since it was never actually implemented in tor... https://trac.torproject.org/projects/tor/ticket/9271 --- docs/change_log.rst | 1 + stem/descriptor/remote.py | 19 ++++--------------- test/integ/descriptor/remote.py | 40 ++-------------------------------------- 3 files changed, 7 insertions(+), 53 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 26e9966..a414835 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -69,6 +69,7 @@ The following are only available within Stem's `git repository * TypeError under python3 when using 'use_mirrors = True' (:trac:`17083`) * Deprecated hidden service descriptor's *introduction_points_auth* field, which was never implemented in tor (:trac:`15190`, :spec:`9c218f9`) * :func:`~stem.control.Controller.get_hidden_service_descriptor` errored when provided a *servers* argument (:trac:`18401`) + * Deprecated :func:`~stem.descriptor.remote.DescriptorDownloader.get_microdescriptors` as it was never implemented in tor (:trac:`9271`) * Fixed parsing of server descriptor's *allow-single-hop-exits* and *caches-extra-info* lines * Bracketed IPv6 addresses were mistreated as being invalid content * Updated dannenberg's v3ident (:trac:`17906`) diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 09aba84..859eb24 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -47,7 +47,6 @@ content. For example... get_instance - Provides a singleton DescriptorDownloader used for... |- get_server_descriptors - provides present server descriptors |- get_extrainfo_descriptors - provides present extrainfo descriptors - |- get_microdescriptors - provides present microdescriptors +- get_consensus - provides the present consensus or router status entries get_authorities - Provides tor directory information. @@ -66,7 +65,6 @@ content. For example... |- use_directory_mirrors - use directory mirrors to download future descriptors |- get_server_descriptors - provides present server descriptors |- get_extrainfo_descriptors - provides present extrainfo descriptors - |- get_microdescriptors - provides present microdescriptors |- get_consensus - provides the present consensus or router status entries |- get_key_certificates - provides present authority key certificates +- query - request an arbitrary descriptor resource @@ -123,7 +121,6 @@ def get_instance(): * :func:`stem.descriptor.remote.get_server_descriptors` * :func:`stem.descriptor.remote.get_extrainfo_descriptors` - * :func:`stem.descriptor.remote.get_microdescriptors` * :func:`stem.descriptor.remote.get_consensus` .. versionadded:: 1.5.0 @@ -163,18 +160,6 @@ def get_extrainfo_descriptors(fingerprints = None, **query_args): return get_instance().get_extrainfo_descriptors(fingerprints, **query_args) -def get_microdescriptors(hashes, **query_args): - """ - Shorthand for - :func:`~stem.descriptor.remote.DescriptorDownloader.get_microdescriptors` - on our singleton instance. - - .. versionadded:: 1.5.0 - """ - - return get_instance().get_microdescriptors(hashes, **query_args) - - def get_consensus(authority_v3ident = None, **query_args): """ Shorthand for @@ -587,6 +572,10 @@ class DescriptorDownloader(object): that these are only provided via a microdescriptor consensus (such as 'cached-microdesc-consensus' in your data directory). + .. deprecated:: 1.5.0 + This function has never worked, as it was never implemented in tor + (:trac:`9271`). + :param str,list hashes: microdescriptor hash or list of hashes to be retrieved :param query_args: additional arguments for the diff --git a/test/integ/descriptor/remote.py b/test/integ/descriptor/remote.py index ef556ae..5fe6cc1 100644 --- a/test/integ/descriptor/remote.py +++ b/test/integ/descriptor/remote.py @@ -6,12 +6,10 @@ import unittest import stem.descriptor import stem.descriptor.extrainfo_descriptor -import stem.descriptor.microdescriptor import stem.descriptor.networkstatus import stem.descriptor.remote import stem.descriptor.router_status_entry import stem.descriptor.server_descriptor -import test.runner from test.runner import ( require_online, @@ -28,15 +26,12 @@ class TestDescriptorDownloader(unittest.TestCase): descriptors. """ - desc = list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31'))[0] + desc = list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31').run())[0] self.assertEqual('moria1', desc.nickname) - desc = list(stem.descriptor.remote.get_extrainfo_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31'))[0] + desc = list(stem.descriptor.remote.get_extrainfo_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31').run())[0] self.assertEqual('moria1', desc.nickname) - desc = list(stem.descriptor.remote.get_microdescriptors('6dCl6ab8CLo0LeMjxi/MZgVJiZgWN8WKTesWPBMtyTo'))[0] - self.assertEqual('moria1', desc.digest) - consensus = list(stem.descriptor.remote.get_consensus()) self.assertTrue(len(consensus) > 50) @@ -171,37 +166,6 @@ class TestDescriptorDownloader(unittest.TestCase): @require_online @only_run_once - def test_get_microdescriptors(self): - """ - Exercises the downloader's get_microdescriptors() method. - """ - - # TODO: method needs to be fixed - not quite sure what's going wrong... - - test.runner.skip(self, '(test currently broken)') - return - - downloader = stem.descriptor.remote.DescriptorDownloader(validate = True) - - single_query = downloader.get_microdescriptors('6dCl6ab8CLo0LeMjxi/MZgVJiZgWN8WKTesWPBMtyTo') - - multiple_query = downloader.get_microdescriptors([ - '6dCl6ab8CLo0LeMjxi/MZgVJiZgWN8WKTesWPBMtyTo', # moria1 - 'oXBV80OwMACBJpqNeZrYSXF18l9EJCi4/mB8UOl9sME', # tor26 - ]) - - single_query.run() - multiple_query.run() - - single_query_results = list(single_query) - self.assertEqual(1, len(single_query_results)) - self.assertEqual('moria1', single_query_results[0].digest) - self.assertTrue(isinstance(single_query_results[0], stem.descriptor.microdescriptor.Microdescriptor)) - - self.assertEqual(2, len(list(multiple_query))) - - @require_online - @only_run_once def test_get_consensus(self): """ Exercises the downloader's get_consensus() method.

1 0

[stem/master] Key fallback directories on fingerprint
by atagar＠torproject.org 07 Mar '16

07 Mar '16

commit 9fa650f3e20508a366ce71333b96015c54d2d70d Author: Damian Johnson <atagar(a)torproject.org> Date: Sun Mar 6 16:15:53 2016 -0800 Key fallback directories on fingerprint Internal detail, but in our config file we keyed fallback directories on their nickname. This made the config more readable but is a no-go since nicknames are non-unique. At present tor has two Unnamed fallback directories and as a result we could only have information about one. This is all internal details. Only impact for users is that we're no longer missing one of the fallbacks. --- cache_fallback_directories.py | 10 +- stem/descriptor/fallback_directories.cfg | 254 ++++++++++++++++--------------- stem/descriptor/remote.py | 24 +-- 3 files changed, 146 insertions(+), 142 deletions(-) diff --git a/cache_fallback_directories.py b/cache_fallback_directories.py index d6a58a9..138f767 100755 --- a/cache_fallback_directories.py +++ b/cache_fallback_directories.py @@ -55,10 +55,10 @@ if __name__ == '__main__': conf.set('stem_commit', stem_commit) for directory in latest_fallback_directories.values(): - nickname = directory.nickname - conf.set('%s.address' % nickname, directory.address) - conf.set('%s.or_port' % nickname, str(directory.or_port)) - conf.set('%s.dir_port' % nickname, str(directory.dir_port)) - conf.set('%s.fingerprint' % nickname, directory.fingerprint) + fingerprint = directory.fingerprint + conf.set('%s.address' % fingerprint, directory.address) + conf.set('%s.or_port' % fingerprint, str(directory.or_port)) + conf.set('%s.dir_port' % fingerprint, str(directory.dir_port)) + conf.set('%s.nickname' % fingerprint, directory.nickname) conf.save(stem.descriptor.remote.CACHE_PATH) diff --git a/stem/descriptor/fallback_directories.cfg b/stem/descriptor/fallback_directories.cfg index faf6105..d420fb5 100644 --- a/stem/descriptor/fallback_directories.cfg +++ b/stem/descriptor/fallback_directories.cfg @@ -1,126 +1,130 @@ tor_commit e2202146d16af22502fd4166ac926fefa6528dff -stem_commit 7fceffac0f988670f4fd6b5eb061b2ebeee9e560 -Doedel22.address 178.254.44.135 -Doedel22.or_port 9001 -Doedel22.dir_port 9030 -Doedel22.fingerprint 8FA37B93397015B2BC5A525C908485260BE9F422 -Logforme.address 84.219.173.60 -Logforme.or_port 443 -Logforme.dir_port 9030 -Logforme.fingerprint 855BC2DABE24C861CD887DB9B2E950424B49FC34 -Doedel21.address 178.254.44.135 -Doedel21.or_port 443 -Doedel21.dir_port 80 -Doedel21.fingerprint AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2 -kitten4.address 212.47.237.95 -kitten4.or_port 9101 -kitten4.dir_port 9130 -kitten4.fingerprint 6FB38EB22E57EF7ED5EF00238F6A48E553735D88 -kitten3.address 212.47.237.95 -kitten3.or_port 9001 -kitten3.dir_port 9030 -kitten3.fingerprint 3F5D8A879C58961BB45A3D26AC41B543B40236D6 -Unnamed.address 217.12.199.208 -Unnamed.or_port 443 -Unnamed.dir_port 80 -Unnamed.fingerprint DF3AED4322B1824BF5539AE54B2D1B38E080FF05 -coby.address 51.255.33.237 -coby.or_port 9001 -coby.dir_port 9091 -coby.fingerprint A360C21FA87FFA2046D92C17086A6B47E5C68109 -Binnacle.address 108.53.208.157 -Binnacle.or_port 443 -Binnacle.dir_port 80 -Binnacle.fingerprint 4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2 -fluxe3.address 78.47.18.110 -fluxe3.or_port 80 -fluxe3.dir_port 443 -fluxe3.fingerprint F8D27B163B9247B232A2EEE68DD8B698695C28DE -rueckgrat.address 5.9.110.236 -rueckgrat.or_port 9001 -rueckgrat.dir_port 9030 -rueckgrat.fingerprint 0756B7CD4DFC8182BE23143FAC0642F515182CEB -Nurnberg01.address 213.239.210.204 -Nurnberg01.or_port 443 -Nurnberg01.dir_port 22 -Nurnberg01.fingerprint 5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9 -wagner.address 5.175.233.86 -wagner.or_port 443 -wagner.dir_port 80 -wagner.fingerprint 5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33 -kitten2.address 62.210.124.124 -kitten2.or_port 9101 -kitten2.dir_port 9130 -kitten2.fingerprint 2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E -Nurnberg02.address 213.239.220.25 -Nurnberg02.or_port 443 -Nurnberg02.dir_port 22 -Nurnberg02.fingerprint BEE2317AE127EB681C5AE1551C1EA0630580638A -eriador.address 85.25.138.93 -eriador.or_port 4029 -eriador.dir_port 9030 -eriador.fingerprint 6DE61A6F72C1E5418A66BFED80DFB63E4C77668F -Doedel26.address 178.254.20.134 -Doedel26.or_port 443 -Doedel26.dir_port 80 -Doedel26.fingerprint 9F5068310818ED7C70B0BC4087AB55CB12CB4377 -kitten1.address 62.210.124.124 -kitten1.or_port 9001 -kitten1.dir_port 9030 -kitten1.fingerprint 86E78DD3720C78DA8673182EF96C54B162CD660C -bakunin.address 178.16.208.57 -bakunin.or_port 443 -bakunin.dir_port 80 -bakunin.fingerprint 92CFD9565B24646CAC2D172D3DB503D69E777B8A -PedicaboMundi.address 144.76.14.145 -PedicaboMundi.or_port 143 -PedicaboMundi.dir_port 110 -PedicaboMundi.fingerprint 14419131033443AE6E21DA82B0D307F7CAE42BDB -tornoderdednl.address 178.62.199.226 -tornoderdednl.or_port 443 -tornoderdednl.dir_port 80 -tornoderdednl.fingerprint CBEFF7BA4A4062045133C053F2D70524D8BBE5BE -ratchet.address 170.130.1.7 -ratchet.or_port 9001 -ratchet.dir_port 9030 -ratchet.fingerprint FA3415659444AE006E7E9E5375E82F29700CFDFD -Freebird32.address 178.254.13.126 -Freebird32.or_port 9001 -Freebird32.dir_port 9030 -Freebird32.fingerprint 0C475BA4D3AA3C289B716F95954CAD616E50C4E5 -Freebird31.address 178.254.13.126 -Freebird31.or_port 443 -Freebird31.dir_port 80 -Freebird31.fingerprint F9246DEF2B653807236DA134F2AEAB103D58ABFE -12xBTME1.address 81.7.17.171 -12xBTME1.or_port 443 -12xBTME1.dir_port 80 -12xBTME1.fingerprint 00C4B4731658D3B4987132A3F77100CFCB190D97 -kili.address 178.62.173.203 -kili.or_port 9001 -kili.dir_port 9030 -kili.fingerprint DD85503F2D1F52EF9EAD621E942298F46CD2FC10 -fluxe4.address 131.188.40.188 -fluxe4.or_port 80 -fluxe4.dir_port 443 -fluxe4.fingerprint EBE718E1A49EE229071702964F8DB1F318075FF8 -pixelminer.address 81.7.14.246 -pixelminer.or_port 443 -pixelminer.dir_port 80 -pixelminer.fingerprint CE75BF0972ADD52AF8807602374E495C815DB304 -Nurnberg04.address 88.198.38.226 -Nurnberg04.or_port 443 -Nurnberg04.dir_port 22 -Nurnberg04.fingerprint 4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB -Nurnberg03.address 85.10.201.38 -Nurnberg03.or_port 443 -Nurnberg03.dir_port 22 -Nurnberg03.fingerprint F6279A203C1950ACF592322A235647A05BFBCF91 -Doedel24.address 178.254.20.134 -Doedel24.or_port 9001 -Doedel24.dir_port 9030 -Doedel24.fingerprint 2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC -horizons.address 167.114.35.28 -horizons.or_port 9001 -horizons.dir_port 9030 -horizons.fingerprint E65D300F11E1DB12C534B0146BDAB6972F1A8A48 +stem_commit a96ec510539f2918bf93c50d63ce68e919f71209 +8FA37B93397015B2BC5A525C908485260BE9F422.address 178.254.44.135 +8FA37B93397015B2BC5A525C908485260BE9F422.or_port 9001 +8FA37B93397015B2BC5A525C908485260BE9F422.dir_port 9030 +8FA37B93397015B2BC5A525C908485260BE9F422.nickname Doedel22 +855BC2DABE24C861CD887DB9B2E950424B49FC34.address 84.219.173.60 +855BC2DABE24C861CD887DB9B2E950424B49FC34.or_port 443 +855BC2DABE24C861CD887DB9B2E950424B49FC34.dir_port 9030 +855BC2DABE24C861CD887DB9B2E950424B49FC34.nickname Logforme +AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.address 178.254.44.135 +AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.or_port 443 +AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.dir_port 80 +AE6A8C18E7499B586CD36246AC4BCAFFBBF93AB2.nickname Doedel21 +6FB38EB22E57EF7ED5EF00238F6A48E553735D88.address 212.47.237.95 +6FB38EB22E57EF7ED5EF00238F6A48E553735D88.or_port 9101 +6FB38EB22E57EF7ED5EF00238F6A48E553735D88.dir_port 9130 +6FB38EB22E57EF7ED5EF00238F6A48E553735D88.nickname kitten4 +3F5D8A879C58961BB45A3D26AC41B543B40236D6.address 212.47.237.95 +3F5D8A879C58961BB45A3D26AC41B543B40236D6.or_port 9001 +3F5D8A879C58961BB45A3D26AC41B543B40236D6.dir_port 9030 +3F5D8A879C58961BB45A3D26AC41B543B40236D6.nickname kitten3 +943C0C6841C1E914B9FCA796C6846620A5AF9BC7.address 217.12.210.214 +943C0C6841C1E914B9FCA796C6846620A5AF9BC7.or_port 443 +943C0C6841C1E914B9FCA796C6846620A5AF9BC7.dir_port 80 +943C0C6841C1E914B9FCA796C6846620A5AF9BC7.nickname Unnamed +A360C21FA87FFA2046D92C17086A6B47E5C68109.address 51.255.33.237 +A360C21FA87FFA2046D92C17086A6B47E5C68109.or_port 9001 +A360C21FA87FFA2046D92C17086A6B47E5C68109.dir_port 9091 +A360C21FA87FFA2046D92C17086A6B47E5C68109.nickname coby +4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.address 108.53.208.157 +4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.or_port 443 +4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.dir_port 80 +4F0DB7E687FC7C0AE55C8F243DA8B0EB27FBF1F2.nickname Binnacle +F8D27B163B9247B232A2EEE68DD8B698695C28DE.address 78.47.18.110 +F8D27B163B9247B232A2EEE68DD8B698695C28DE.or_port 80 +F8D27B163B9247B232A2EEE68DD8B698695C28DE.dir_port 443 +F8D27B163B9247B232A2EEE68DD8B698695C28DE.nickname fluxe3 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.address 5.9.110.236 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.or_port 9001 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.dir_port 9030 +0756B7CD4DFC8182BE23143FAC0642F515182CEB.nickname rueckgrat +5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9.address 213.239.210.204 +5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9.or_port 443 +5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9.dir_port 22 +5BFDECCE9B4A23AE14EC767C5A2C1E10558B00B9.nickname Nurnberg01 +5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.address 5.175.233.86 +5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.or_port 443 +5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.dir_port 80 +5525D0429BFE5DC4F1B0E9DE47A4CFA169661E33.nickname wagner +2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.address 62.210.124.124 +2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.or_port 9101 +2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.dir_port 9130 +2EBD117806EE43C3CC885A8F1E4DC60F207E7D3E.nickname kitten2 +BEE2317AE127EB681C5AE1551C1EA0630580638A.address 213.239.220.25 +BEE2317AE127EB681C5AE1551C1EA0630580638A.or_port 443 +BEE2317AE127EB681C5AE1551C1EA0630580638A.dir_port 22 +BEE2317AE127EB681C5AE1551C1EA0630580638A.nickname Nurnberg02 +DF3AED4322B1824BF5539AE54B2D1B38E080FF05.address 217.12.199.208 +DF3AED4322B1824BF5539AE54B2D1B38E080FF05.or_port 443 +DF3AED4322B1824BF5539AE54B2D1B38E080FF05.dir_port 80 +DF3AED4322B1824BF5539AE54B2D1B38E080FF05.nickname Unnamed +6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.address 85.25.138.93 +6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.or_port 4029 +6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.dir_port 9030 +6DE61A6F72C1E5418A66BFED80DFB63E4C77668F.nickname eriador +9F5068310818ED7C70B0BC4087AB55CB12CB4377.address 178.254.20.134 +9F5068310818ED7C70B0BC4087AB55CB12CB4377.or_port 443 +9F5068310818ED7C70B0BC4087AB55CB12CB4377.dir_port 80 +9F5068310818ED7C70B0BC4087AB55CB12CB4377.nickname Doedel26 +86E78DD3720C78DA8673182EF96C54B162CD660C.address 62.210.124.124 +86E78DD3720C78DA8673182EF96C54B162CD660C.or_port 9001 +86E78DD3720C78DA8673182EF96C54B162CD660C.dir_port 9030 +86E78DD3720C78DA8673182EF96C54B162CD660C.nickname kitten1 +92CFD9565B24646CAC2D172D3DB503D69E777B8A.address 178.16.208.57 +92CFD9565B24646CAC2D172D3DB503D69E777B8A.or_port 443 +92CFD9565B24646CAC2D172D3DB503D69E777B8A.dir_port 80 +92CFD9565B24646CAC2D172D3DB503D69E777B8A.nickname bakunin +14419131033443AE6E21DA82B0D307F7CAE42BDB.address 144.76.14.145 +14419131033443AE6E21DA82B0D307F7CAE42BDB.or_port 143 +14419131033443AE6E21DA82B0D307F7CAE42BDB.dir_port 110 +14419131033443AE6E21DA82B0D307F7CAE42BDB.nickname PedicaboMundi +CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.address 178.62.199.226 +CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.or_port 443 +CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.dir_port 80 +CBEFF7BA4A4062045133C053F2D70524D8BBE5BE.nickname tornoderdednl +FA3415659444AE006E7E9E5375E82F29700CFDFD.address 170.130.1.7 +FA3415659444AE006E7E9E5375E82F29700CFDFD.or_port 9001 +FA3415659444AE006E7E9E5375E82F29700CFDFD.dir_port 9030 +FA3415659444AE006E7E9E5375E82F29700CFDFD.nickname ratchet +0C475BA4D3AA3C289B716F95954CAD616E50C4E5.address 178.254.13.126 +0C475BA4D3AA3C289B716F95954CAD616E50C4E5.or_port 9001 +0C475BA4D3AA3C289B716F95954CAD616E50C4E5.dir_port 9030 +0C475BA4D3AA3C289B716F95954CAD616E50C4E5.nickname Freebird32 +F9246DEF2B653807236DA134F2AEAB103D58ABFE.address 178.254.13.126 +F9246DEF2B653807236DA134F2AEAB103D58ABFE.or_port 443 +F9246DEF2B653807236DA134F2AEAB103D58ABFE.dir_port 80 +F9246DEF2B653807236DA134F2AEAB103D58ABFE.nickname Freebird31 +00C4B4731658D3B4987132A3F77100CFCB190D97.address 81.7.17.171 +00C4B4731658D3B4987132A3F77100CFCB190D97.or_port 443 +00C4B4731658D3B4987132A3F77100CFCB190D97.dir_port 80 +00C4B4731658D3B4987132A3F77100CFCB190D97.nickname 12xBTME1 +DD85503F2D1F52EF9EAD621E942298F46CD2FC10.address 178.62.173.203 +DD85503F2D1F52EF9EAD621E942298F46CD2FC10.or_port 9001 +DD85503F2D1F52EF9EAD621E942298F46CD2FC10.dir_port 9030 +DD85503F2D1F52EF9EAD621E942298F46CD2FC10.nickname kili +EBE718E1A49EE229071702964F8DB1F318075FF8.address 131.188.40.188 +EBE718E1A49EE229071702964F8DB1F318075FF8.or_port 80 +EBE718E1A49EE229071702964F8DB1F318075FF8.dir_port 443 +EBE718E1A49EE229071702964F8DB1F318075FF8.nickname fluxe4 +CE75BF0972ADD52AF8807602374E495C815DB304.address 81.7.14.246 +CE75BF0972ADD52AF8807602374E495C815DB304.or_port 443 +CE75BF0972ADD52AF8807602374E495C815DB304.dir_port 80 +CE75BF0972ADD52AF8807602374E495C815DB304.nickname pixelminer +4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB.address 88.198.38.226 +4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB.or_port 443 +4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB.dir_port 22 +4B9E2C56FB42B891794FE2CD2FCAD08A320CC3BB.nickname Nurnberg04 +F6279A203C1950ACF592322A235647A05BFBCF91.address 85.10.201.38 +F6279A203C1950ACF592322A235647A05BFBCF91.or_port 443 +F6279A203C1950ACF592322A235647A05BFBCF91.dir_port 22 +F6279A203C1950ACF592322A235647A05BFBCF91.nickname Nurnberg03 +2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC.address 178.254.20.134 +2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC.or_port 9001 +2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC.dir_port 9030 +2CE96A8A1DA032664C90F574AFFBECE18A6E8DFC.nickname Doedel24 +E65D300F11E1DB12C534B0146BDAB6972F1A8A48.address 167.114.35.28 +E65D300F11E1DB12C534B0146BDAB6972F1A8A48.or_port 9001 +E65D300F11E1DB12C534B0146BDAB6972F1A8A48.dir_port 9030 +E65D300F11E1DB12C534B0146BDAB6972F1A8A48.nickname horizons diff --git a/stem/descriptor/remote.py b/stem/descriptor/remote.py index 1afa70a..baba8ac 100644 --- a/stem/descriptor/remote.py +++ b/stem/descriptor/remote.py @@ -948,34 +948,34 @@ class FallbackDirectory(Directory): results = {} - for nickname in set([key.split('.')[0] for key in conf.keys()]): - if nickname in ('tor_commit', 'stem_commit'): + for fingerprint in set([key.split('.')[0] for key in conf.keys()]): + if fingerprint in ('tor_commit', 'stem_commit'): continue attr = {} - for attr_name in ('address', 'or_port', 'dir_port', 'fingerprint'): - key = '%s.%s' % (nickname, attr_name) + for attr_name in ('address', 'or_port', 'dir_port', 'nickname'): + key = '%s.%s' % (fingerprint, attr_name) attr[attr_name] = conf.get(key) if not attr[attr_name]: raise IOError("'%s' is missing from %s" % (key, CACHE_PATH)) if not connection.is_valid_ipv4_address(attr['address']): - raise IOError("'%s.address' was an invalid address (%s)" % (nickname, attr['address'])) + raise IOError("'%s.address' was an invalid address (%s)" % (fingerprint, attr['address'])) elif not connection.is_valid_port(attr['or_port']): - raise IOError("'%s.or_port' was an invalid port (%s)" % (nickname, attr['or_port'])) + raise IOError("'%s.or_port' was an invalid port (%s)" % (fingerprint, attr['or_port'])) elif not connection.is_valid_port(attr['dir_port']): - raise IOError("'%s.dir_port' was an invalid port (%s)" % (nickname, attr['dir_port'])) - elif not tor_tools.is_valid_fingerprint(attr['fingerprint']): - raise IOError("'%s.fingerprint' was an invalid fingerprint (%s)" % (nickname, attr['fingerprint'])) + raise IOError("'%s.dir_port' was an invalid port (%s)" % (fingerprint, attr['dir_port'])) + elif not tor_tools.is_valid_nickname(attr['nickname']): + raise IOError("'%s.nickname' was an invalid nickname (%s)" % (fingerprint, attr['nickname'])) - results[attr['fingerprint']] = FallbackDirectory( + results[fingerprint] = FallbackDirectory( address = attr['address'], or_port = int(attr['or_port']), dir_port = int(attr['dir_port']), - fingerprint = attr['fingerprint'], - nickname = nickname, + fingerprint = fingerprint, + nickname = attr['nickname'], ) return results

1 0

[stem/master] test_shorthand_aliases integ test broken
by atagar＠torproject.org 07 Mar '16

07 Mar '16

commit e4dc4e7560cc980257fdd96ba9b58c326b138af6 Author: Damian Johnson <atagar(a)torproject.org> Date: Mon Mar 7 13:08:07 2016 -0800 test_shorthand_aliases integ test broken Our unit tests caused us to cache a Mock object rather than a DescriptorDownloader for our singleton. This in turn broke our later integ tests... ====================================================================== ERROR: test_shorthand_aliases ---------------------------------------------------------------------- Traceback (most recent call last): File "/home/atagar/Desktop/stem/test/runner.py", line 161, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/runner.py", line 178, in wrapped return func(self, *args, **kwargs) File "/home/atagar/Desktop/stem/test/integ/descriptor/remote.py", line 31, in test_shorthand_aliases desc = list(stem.descriptor.remote.get_server_descriptors('9695DFC35FFEB861329B9F1AB04C46397020CE31').run())[0] IndexError: list index out of range --- test/unit/tutorial.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/unit/tutorial.py b/test/unit/tutorial.py index 3c5bfd6..ac0bdd4 100644 --- a/test/unit/tutorial.py +++ b/test/unit/tutorial.py @@ -5,6 +5,8 @@ Tests for the examples given in stem's tutorial. import io import unittest +import stem.descriptor.remote + from stem.control import Controller from stem.descriptor.reader import DescriptorReader from stem.descriptor.server_descriptor import RelayDescriptor @@ -38,6 +40,12 @@ MIRROR_MIRROR_OUTPUT = """\ class TestTutorial(unittest.TestCase): + def tearDown(self): + # Ensure we don't cache a Mock object as our downloader. Otherwise future + # tests will understandably be very sad. :P + + stem.descriptor.remote.SINGLETON_DOWNLOADER = None + @patch('sys.stdout', new_callable = StringIO) @patch('stem.control.Controller.from_port', spec = Controller) def test_the_little_relay_that_could(self, from_port_mock, stdout_mock):

1 0