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

[translation/mat-gui_completed] Update translations for mat-gui_completed
by translation＠torproject.org 28 Jan '16

28 Jan '16

commit 324c064c0bcced7f18b4fd8bea9c0fda30ce570f Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 20:15:39 2016 +0000 Update translations for mat-gui_completed --- eu.po | 102 ++++++++++++++++++++++++++++++++++------------------------------- 1 file changed, 53 insertions(+), 49 deletions(-) diff --git a/eu.po b/eu.po index 7562db9..642653a 100644 --- a/eu.po +++ b/eu.po @@ -3,184 +3,188 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Antxon Baldarra <baldarra(a)bitmessage.ch>, 2014 +# Antxon Baldarra <baldarra(a)bitmessage.ch>, 2014,2016 # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2013 # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-12-31 04:53+0100\n" -"PO-Revision-Date: 2015-02-23 08:18+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" -"Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n" +"POT-Creation-Date: 2016-01-03 20:54+0100\n" +"PO-Revision-Date: 2016-01-28 20:12+0000\n" +"Last-Translator: Antxon Baldarra <baldarra(a)bitmessage.ch>\n" +"Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:62 mat-gui:407 mat-gui:430 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "Prest" -#: mat-gui:129 +#: mat-gui:136 msgid "Choose files" msgstr "Hautatu fitxategiak" -#: mat-gui:137 -msgid "All files" -msgstr "Fitxategi guztiak" - -#: mat-gui:143 +#: mat-gui:144 msgid "Supported files" msgstr "Onartutako fitxategiak" -#: mat-gui:160 mat-gui:353 mat-gui:402 mat-gui:426 mat-gui:428 -#: data/mat.glade:172 +#: mat-gui:151 +msgid "All files" +msgstr "Fitxategi guztiak" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "Garbitu" -#: mat-gui:161 +#: mat-gui:168 msgid "No metadata found" msgstr "Ez da metadaturik aurkitu" -#: mat-gui:163 mat-gui:404 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "Zikina" -#: mat-gui:168 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr "%sren metadatuak" -#: mat-gui:179 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "Zaborrara bota zure meta, gorde zure datuak" -#: mat-gui:184 +#: mat-gui:192 msgid "Website" msgstr "Webgunea" -#: mat-gui:210 +#: mat-gui:219 msgid "Preferences" msgstr "Hobespenak" -#: mat-gui:223 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "PDF kalitatea murriztu" -#: mat-gui:226 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "Sortutako PDFaren neurri eta kalitatea murriztu" -#: mat-gui:229 +#: mat-gui:238 msgid "Add unsupported file to archives" msgstr "Gehitu fitxategi ez onartua artxiboetara" -#: mat-gui:232 +#: mat-gui:241 msgid "Add non-supported (and so non-anonymised) file to output archive" msgstr "Gehitu fitxategi ez onartua (eta baita anonimotu gabekoa) irteera artxibora" -#: mat-gui:271 +#: mat-gui:280 msgid "Unknown" msgstr "Ezezaguna" -#: mat-gui:314 +#: mat-gui:325 msgid "Not-supported" msgstr "Ez onartuak" -#: mat-gui:328 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "Arriskurik gabeko fitxategi formatua" -#: mat-gui:330 +#: mat-gui:341 +msgid "Cant read file" +msgstr "Ezin da fitxategia irakurri" + +#: mat-gui:343 msgid "Fileformat not supported" msgstr "Fitxategi formatu ez onartua" -#: mat-gui:333 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "Fitxategi hauek ezin dira prozesatu:" -#: mat-gui:338 mat-gui:367 data/mat.glade:211 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "Fitxategi izena" -#: mat-gui:340 +#: mat-gui:353 msgid "Reason" msgstr "Zergatia" -#: mat-gui:352 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "Fitxategi ez onartuak artxiboan" -#: mat-gui:366 +#: mat-gui:379 msgid "Include" msgstr "Sartu" -#: mat-gui:382 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "MAT ez da %s artxiboan aurkitutako hurrengo fitxategiak garbitzeko gai" -#: mat-gui:398 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "%s egiaztatzen" -#: mat-gui:413 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "%s garbitzen" -#: data/mat.glade:33 +#: data/mat.glade:46 msgid "_File" msgstr "_Fitxategia" -#: data/mat.glade:82 +#: data/mat.glade:95 msgid "_Edit" msgstr "_Editatu" -#: data/mat.glade:115 +#: data/mat.glade:141 msgid "_Help" msgstr "_Laguntza" -#: data/mat.glade:159 +#: data/mat.glade:187 msgid "Add" msgstr "Gehitu" -#: data/mat.glade:228 +#: data/mat.glade:256 msgid "State" msgstr "Egoera" -#: data/mat.glade:274 data/mat.glade:417 +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "Metadatuak" -#: data/mat.glade:306 +#: data/mat.glade:354 msgid "Name" msgstr "Izena" -#: data/mat.glade:320 +#: data/mat.glade:368 msgid "Content" msgstr "Edukia" -#: data/mat.glade:374 +#: data/mat.glade:398 msgid "Supported formats" msgstr "Onartutako formatuak" -#: data/mat.glade:406 +#: data/mat.glade:456 msgid "Support" msgstr "Onartu" -#: data/mat.glade:428 +#: data/mat.glade:478 msgid "Method" msgstr "Metodoa" -#: data/mat.glade:439 +#: data/mat.glade:489 msgid "Remaining" msgstr "Faltan" -#: data/mat.glade:468 +#: data/mat.glade:518 msgid "Fileformat" msgstr "Fitxategi-formatua"

1 0

[translation/mat-gui] Update translations for mat-gui
by translation＠torproject.org 28 Jan '16

28 Jan '16

commit 519c22197dbbb82c8b9069e53de91ec7509a4a85 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 28 20:15:34 2016 +0000 Update translations for mat-gui --- eu.po | 130 ++++++++++++++++++++++++++++++++--------------------------------- 1 file changed, 65 insertions(+), 65 deletions(-) diff --git a/eu.po b/eu.po index 70266a7..642653a 100644 --- a/eu.po +++ b/eu.po @@ -3,16 +3,16 @@ # This file is distributed under the same license as the PACKAGE package. # # Translators: -# Antxon Baldarra <baldarra(a)bitmessage.ch>, 2014 +# Antxon Baldarra <baldarra(a)bitmessage.ch>, 2014,2016 # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2013 # Antxon Baldarra <baldarra(a)bitmessage.ch>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-12-16 15:03+0100\n" -"PO-Revision-Date: 2015-12-17 09:29+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"POT-Creation-Date: 2016-01-03 20:54+0100\n" +"PO-Revision-Date: 2016-01-28 20:12+0000\n" +"Last-Translator: Antxon Baldarra <baldarra(a)bitmessage.ch>\n" "Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -20,171 +20,171 @@ msgstr "" "Language: eu\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: mat-gui:64 mat-gui:415 mat-gui:438 +#: mat-gui:66 mat-gui:422 mat-gui:445 msgid "Ready" msgstr "Prest" -#: mat-gui:133 +#: mat-gui:136 msgid "Choose files" msgstr "Hautatu fitxategiak" -#: mat-gui:141 -msgid "All files" -msgstr "Fitxategi guztiak" - -#: mat-gui:147 +#: mat-gui:144 msgid "Supported files" msgstr "Onartutako fitxategiak" -#: mat-gui:164 mat-gui:359 mat-gui:410 mat-gui:434 mat-gui:436 -#: data/mat.glade:480 +#: mat-gui:151 +msgid "All files" +msgstr "Fitxategi guztiak" + +#: mat-gui:167 mat-gui:366 mat-gui:417 mat-gui:441 mat-gui:443 +#: data/mat.glade:200 msgid "Clean" msgstr "Garbitu" -#: mat-gui:165 +#: mat-gui:168 msgid "No metadata found" msgstr "Ez da metadaturik aurkitu" -#: mat-gui:167 mat-gui:412 +#: mat-gui:170 mat-gui:419 msgid "Dirty" msgstr "Zikina" -#: mat-gui:172 +#: mat-gui:176 #, python-format msgid "%s's metadata" msgstr "%sren metadatuak" -#: mat-gui:183 +#: mat-gui:187 msgid "Trash your meta, keep your data" msgstr "Zaborrara bota zure meta, gorde zure datuak" -#: mat-gui:188 +#: mat-gui:192 msgid "Website" msgstr "Webgunea" -#: mat-gui:214 +#: mat-gui:219 msgid "Preferences" msgstr "Hobespenak" -#: mat-gui:227 +#: mat-gui:232 msgid "Reduce PDF quality" msgstr "PDF kalitatea murriztu" -#: mat-gui:230 +#: mat-gui:235 msgid "Reduce the produced PDF size and quality" msgstr "Sortutako PDFaren neurri eta kalitatea murriztu" -#: mat-gui:233 +#: mat-gui:238 msgid "Add unsupported file to archives" msgstr "Gehitu fitxategi ez onartua artxiboetara" -#: mat-gui:236 +#: mat-gui:241 msgid "Add non-supported (and so non-anonymised) file to output archive" msgstr "Gehitu fitxategi ez onartua (eta baita anonimotu gabekoa) irteera artxibora" -#: mat-gui:275 +#: mat-gui:280 msgid "Unknown" msgstr "Ezezaguna" -#: mat-gui:318 +#: mat-gui:325 msgid "Not-supported" msgstr "Ez onartuak" -#: mat-gui:332 +#: mat-gui:339 msgid "Harmless fileformat" msgstr "Arriskurik gabeko fitxategi formatua" -#: mat-gui:334 +#: mat-gui:341 msgid "Cant read file" -msgstr "" +msgstr "Ezin da fitxategia irakurri" -#: mat-gui:336 +#: mat-gui:343 msgid "Fileformat not supported" msgstr "Fitxategi formatu ez onartua" -#: mat-gui:339 +#: mat-gui:346 msgid "These files can not be processed:" msgstr "Fitxategi hauek ezin dira prozesatu:" -#: mat-gui:344 mat-gui:373 data/mat.glade:519 +#: mat-gui:351 mat-gui:380 data/mat.glade:239 msgid "Filename" msgstr "Fitxategi izena" -#: mat-gui:346 +#: mat-gui:353 msgid "Reason" msgstr "Zergatia" -#: mat-gui:358 +#: mat-gui:365 msgid "Non-supported files in archive" msgstr "Fitxategi ez onartuak artxiboan" -#: mat-gui:372 +#: mat-gui:379 msgid "Include" msgstr "Sartu" -#: mat-gui:390 +#: mat-gui:397 #, python-format msgid "MAT is not able to clean the following files, found in the %s archive" msgstr "MAT ez da %s artxiboan aurkitutako hurrengo fitxategiak garbitzeko gai" -#: mat-gui:406 +#: mat-gui:413 #, python-format msgid "Checking %s" msgstr "%s egiaztatzen" -#: mat-gui:421 +#: mat-gui:428 #, python-format msgid "Cleaning %s" msgstr "%s garbitzen" -#: data/mat.glade:26 data/mat.glade:196 +#: data/mat.glade:46 +msgid "_File" +msgstr "_Fitxategia" + +#: data/mat.glade:95 +msgid "_Edit" +msgstr "_Editatu" + +#: data/mat.glade:141 +msgid "_Help" +msgstr "_Laguntza" + +#: data/mat.glade:187 +msgid "Add" +msgstr "Gehitu" + +#: data/mat.glade:256 +msgid "State" +msgstr "Egoera" + +#: data/mat.glade:294 data/mat.glade:467 msgid "Metadata" msgstr "Metadatuak" -#: data/mat.glade:85 +#: data/mat.glade:354 msgid "Name" msgstr "Izena" -#: data/mat.glade:99 +#: data/mat.glade:368 msgid "Content" msgstr "Edukia" -#: data/mat.glade:129 +#: data/mat.glade:398 msgid "Supported formats" msgstr "Onartutako formatuak" -#: data/mat.glade:185 +#: data/mat.glade:456 msgid "Support" msgstr "Onartu" -#: data/mat.glade:207 +#: data/mat.glade:478 msgid "Method" msgstr "Metodoa" -#: data/mat.glade:218 +#: data/mat.glade:489 msgid "Remaining" msgstr "Faltan" -#: data/mat.glade:247 +#: data/mat.glade:518 msgid "Fileformat" msgstr "Fitxategi-formatua" - -#: data/mat.glade:326 -msgid "_File" -msgstr "_Fitxategia" - -#: data/mat.glade:375 -msgid "_Edit" -msgstr "_Editatu" - -#: data/mat.glade:421 -msgid "_Help" -msgstr "_Laguntza" - -#: data/mat.glade:467 -msgid "Add" -msgstr "Gehitu" - -#: data/mat.glade:536 -msgid "State" -msgstr "Egoera"

1 0

[stem/master] Additional information when stem.util.system.call() fails
by atagar＠torproject.org 28 Jan '16

28 Jan '16

commit 5b8b5ca5dc3cd2c0797c10910d6826e274651ff5 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 28 08:32:15 2016 -0800 Additional information when stem.util.system.call() fails Commonly callers at least want the stderr. I ran into this because our cache_manual.py error output sucked... IOError: Unable to run 'a2x -f manpage /tmp/tmpU36UMJ/tor.1.txt': a2x -f manpage /tmp/tmpU36UMJ/tor.1.txt returned exit status 1 This says the command twice, and gives no useful informaiton about what the error even is. Now it's... IOError: Unable to run 'a2x -f manpage /tmp/tmpfq6cVA/tor.1.txt': a2x: ERROR: /usr/bin/asciidoc --backend docbook -a a2x-format=manpage --doctype manpage --out-file /tmp/tmpfq6cVA/tor.1.xml /tmp/tmpfq6cVA/tor.1.txt returned non-zero exit status 1 --- docs/change_log.rst | 5 +++-- stem/manual.py | 4 ++-- stem/util/system.py | 43 ++++++++++++++++++++++++++++++++++++++----- 3 files changed, 43 insertions(+), 9 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index b386670..74159e2 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -72,11 +72,12 @@ The following are only available within Stem's `git repository * **Utilities** * IPv6 support in :func:`~stem.util.connection.get_connections` when resolving with proc, netstat, lsof, or ss (:trac:`18079`) - * Added :func:`~stem.util.__init__.datetime_to_unix` * The 'ss' connection resolver didn't work on Gentoo (:trac:`18079`) * Recognize IPv4-mapped IPv6 addresses in our utils (:trac:`18079`) - * Added an **is_ipv6** value to :class:`~stem.util.connection.Connection` instances * Allow :func:`stem.util.conf.Config.set` to remove values when provided with a **None** value + * Additional information when :func:`~stem.util.system.call` fails through a :class:`~stem.util.system.CallError` + * Added an **is_ipv6** value to :class:`~stem.util.connection.Connection` instances + * Added :func:`~stem.util.__init__.datetime_to_unix` * **Interpreter** diff --git a/stem/manual.py b/stem/manual.py index 55c94a2..31f9ed1 100644 --- a/stem/manual.py +++ b/stem/manual.py @@ -245,8 +245,8 @@ def download_man_page(path = None, file_handle = None, url = GITWEB_MANUAL_URL, if not os.path.exists(manual_path): raise OSError('no man page was generated') - except OSError as exc: - raise IOError("Unable to run 'a2x -f manpage %s': %s" % (asciidoc_path, exc)) + except stem.util.system.CallError as exc: + raise IOError("Unable to run '%s': %s" % (exc.command, exc.stderr)) if path: try: diff --git a/stem/util/system.py b/stem/util/system.py index 318b7e4..14516b2 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -126,6 +126,32 @@ _PROCESS_NAME = None _MAX_NAME_LENGTH = -1 +class CallError(OSError): + """ + Error response when making a system call. This is an **OSError** subclass + with additional information about the process. Depending on the nature of the + error not all of these attributes will be available. + + :var str msg: exception string + :var str command: command that was ran + :var int exit_status: exit code of the process + :var float runtime: time the command took to run + :var str stdout: stdout of the process + :var str stderr: stderr of the process + """ + + def __init__(self, msg, command, exit_status, runtime, stdout, stderr): + self.msg = msg + self.command = command + self.exit_status = exit_status + self.runtime = runtime + self.stdout = stdout + self.stderr = stderr + + def __str__(self): + return self.msg + + def is_windows(): """ Checks if we are running on Windows. @@ -960,6 +986,10 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, env = None): are not permitted. .. versionchanged:: 1.5.0 + Providing additional information upon failure by raising a CallError. This + is a subclass of OSError, providing backward compatibility. + + .. versionchanged:: 1.5.0 Added env argument. :param str,list command: command to be issued @@ -970,7 +1000,8 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, env = None): :returns: **list** with the lines of output from the command - :raises: **OSError** if this fails and no default was provided + :raises: **CallError** if this fails and no default was provided, this is an + **OSError** subclass """ if isinstance(command, str): @@ -978,6 +1009,8 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, env = None): else: command_list = command + exit_status, runtime, stdout, stderr = None, None, None, None + try: is_shell_command = command_list[0] in SHELL_COMMANDS @@ -998,10 +1031,10 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, env = None): elif stderr: log.trace(trace_prefix + ', stderr:\n%s' % stderr) - exit_code = process.poll() + exit_status = process.poll() - if not ignore_exit_status and exit_code != 0: - raise OSError('%s returned exit status %i' % (command, exit_code)) + if not ignore_exit_status and exit_status != 0: + raise OSError('%s returned exit status %i' % (command, exit_status)) if stdout: return stdout.decode('utf-8', 'replace').splitlines() @@ -1013,7 +1046,7 @@ def call(command, default = UNDEFINED, ignore_exit_status = False, env = None): if default != UNDEFINED: return default else: - raise + raise CallError(str(exc), ' '.join(command_list), exit_status, runtime, stdout, stderr) def get_process_name():

1 0

[stem/master] Keygen manual information
by atagar＠torproject.org 28 Jan '16

28 Jan '16

commit d0cad523579df662370123dc4a5471806eada39f Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 28 08:59:46 2016 -0800 Keygen manual information Quick update for https://trac.torproject.org/projects/tor/ticket/17583 --- stem/cached_tor_manual.cfg | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/stem/cached_tor_manual.cfg b/stem/cached_tor_manual.cfg index 2e35cad..4866251 100644 --- a/stem/cached_tor_manual.cfg +++ b/stem/cached_tor_manual.cfg @@ -6,8 +6,8 @@ description |Basically, Tor provides a distributed network of servers or relays ("onion routers"). Users bounce their TCP streams -- web traffic, ftp, ssh, etc. -- around the network, and recipients, observers, and even the relays themselves have difficulty tracking the source of the stream. | |By default, tor will only act as a client only. To help the network by providing bandwidth as a relay, change the ORPort configuration option -- see below. Please also consult the documentation on the Tor Project's website. -man_commit 4f0e28977d6376ccba599e7089aeb9e3b4f25e5f -stem_commit 3c7ea19c05dfb5c373cafd367e08741a79c8d9d3 +man_commit a5bed4dab2f8521f744d5137e4f439b073c7e5e9 +stem_commit 5b8b5ca5dc3cd2c0797c10910d6826e274651ff5 commandline_options -f FILE => Specify a new configuration file to contain further Tor configuration options OR pass - to make Tor read its configuration from standard input. (Default: @CONFDIR@/torrc, or $HOME/.torrc if that file is not found) commandline_options --ignore-missing-torrc => Specifies that Tor should treat a missing torrc file as though it were empty. Ordinarily, Tor does this for missing default torrc files, but not for those specified on the command line. commandline_options --list-fingerprint => Generate your keys and output your nickname and fingerprint. @@ -17,6 +17,7 @@ commandline_options --nt-service => Used internally to implement a Windows servi commandline_options --verify-config => Verify the configuration file is valid. commandline_options --service remove|start|stop => Remove, start, or stop a configured Tor Windows service. commandline_options --quiet|--hush => Override the default console log. By default, Tor starts out logging messages at level "notice" and higher to the console. It stops doing so after it parses its configuration, if the configuration tells it to log anywhere else. You can override this behavior with the --hush option, which tells Tor to only send warnings and errors to the console, or with the --quiet option, which tells Tor not to log to the console at all. +commandline_options --keygen [--newpass] => Running "tor --keygen" creates a new ed25519 master identity key for a relay, or only a fresh temporary signing key and certificate, if you already have a master key. Optionally you can encrypt the master identity key with a passphrase: Tor will ask you for one. If you don't want to encrypt the master key, just don't enter any passphrase when asked. The --newpass option should be used with --keygen only when you need to add, change, or remove a passphrase on an existing ed25519 master identity key. You will be prompted for the old passphase (if any), and the new passphrase (if any). When generating a master key, you will probably want to use --DataDirectory to control where the keys and certificates will be stored, and --SigningKeyLifetime to control their lifetimes. Their behavior is as documented in the server options section below. (You must have write access to the specified DataDirectory.) To use the generated files, you must copy the m to the DataDirectory/keys directory of your Tor daemon, and make sure that they are owned by the user actually running the Tor daemon on your system. commandline_options --list-torrc-options => List all valid options. commandline_options --service install [--options command-line options] => Install an instance of Tor as a Windows service, with the provided command-line options. Current instructions can be found at https://www.torproject.org/docs/faq#NTService commandline_options --version => Display Tor version and exit. @@ -1398,7 +1399,7 @@ config_options.OfflineMasterKey.category Relay config_options.OfflineMasterKey.name OfflineMasterKey config_options.OfflineMasterKey.usage 0|1 config_options.OfflineMasterKey.summary Don't generate the master secret key -config_options.OfflineMasterKey.description If non-zero, the Tor relay will never generate or load its master secret key. Instead, you'll have to use "tor --keygen" to manage the master secret key. (Default: 0) +config_options.OfflineMasterKey.description If non-zero, the Tor relay will never generate or load its master secret key. Instead, you'll have to use "tor --keygen" to manage the permanent ed25519 master identity key, as well as the corresponding temporary signing keys and certificates. (Default: 0) config_options.HiddenServiceDir.category Hidden Service config_options.HiddenServiceDir.name HiddenServiceDir config_options.HiddenServiceDir.usage DIRECTORY

1 0

[stem/master] Have get_connections() resolve the pid if not provided with one
by atagar＠torproject.org 28 Jan '16

28 Jan '16

commit 949e59ffcf2eb09495ec7b42672598af5e0bb656 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 28 09:20:30 2016 -0800 Have get_connections() resolve the pid if not provided with one Three of our connection resolvers require a pid to function. When provided with a process name instead we raised a ValueError, but we can at least *try* to resolve the name to a pid. If unsuccessful we now raise an IOError. Thanks to toralf for suggesting this change. --- stem/util/connection.py | 20 ++++++++++++++------ test/unit/manual.py | 2 +- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/stem/util/connection.py b/stem/util/connection.py index cbc6ac2..e72bd12 100644 --- a/stem/util/connection.py +++ b/stem/util/connection.py @@ -166,14 +166,16 @@ def get_connections(resolver, process_pid = None, process_name = None): :returns: **list** of :class:`~stem.util.connection.Connection` instances :raises: - * **ValueError** if using **Resolver.PROC** or **Resolver.BSD_PROCSTAT** - and the process_pid wasn't provided + * **ValueError** if neither a process_pid nor process_name is provided * **IOError** if no connections are available or resolution fails (generally they're indistinguishable). The common causes are the command being unavailable or permissions. """ + if not process_pid and not process_name: + raise ValueError('You must provide a pid or process name to provide connections for') + def _log(msg): if LOG_CONNECTION_RESOLUTION: log.debug(msg) @@ -187,11 +189,17 @@ def get_connections(resolver, process_pid = None, process_name = None): except ValueError: raise ValueError('Process pid was non-numeric: %s' % process_pid) - if process_pid is None and process_name and resolver == Resolver.NETSTAT_WINDOWS: - process_pid = stem.util.system.pid_by_name(process_name) + if process_pid is None: + all_pids = stem.util.system.pid_by_name(process_name, True) - if process_pid is None and resolver in (Resolver.NETSTAT_WINDOWS, Resolver.PROC, Resolver.BSD_PROCSTAT): - raise ValueError('%s resolution requires a pid' % resolver) + if len(all_pids) == 0: + if resolver in (Resolver.NETSTAT_WINDOWS, Resolver.PROC, Resolver.BSD_PROCSTAT): + raise IOError("Unable to determine the pid of '%s'. %s requires the pid to provide the connections." % (process_name, resolver)) + elif len(all_pids) == 1: + process_pid = all_pids[0] + else: + if resolver in (Resolver.NETSTAT_WINDOWS, Resolver.PROC, Resolver.BSD_PROCSTAT): + raise IOError("There's multiple processes named '%s'. %s requires a single pid to provide the connections." % (process_name, resolver)) if resolver == Resolver.PROC: return [Connection(*conn) for conn in stem.util.proc.connections(process_pid)] diff --git a/test/unit/manual.py b/test/unit/manual.py index 8711fb7..99628b0 100644 --- a/test/unit/manual.py +++ b/test/unit/manual.py @@ -238,7 +238,7 @@ class TestManual(unittest.TestCase): @patch('tempfile.mkdtemp', Mock(return_value = '/no/such/path')) @patch('shutil.rmtree', Mock()) @patch('stem.manual.open', Mock(return_value = io.BytesIO()), create = True) - @patch('stem.util.system.call', Mock(side_effect = OSError('call failed'))) + @patch('stem.util.system.call', Mock(side_effect = stem.util.system.CallError('call failed', 'a2x -f manpage /no/such/path/tor.1.txt', 1, None, None, 'call failed'))) @patch('stem.util.system.is_available', Mock(return_value = True)) @patch(URL_OPEN, Mock(return_value = io.BytesIO(b'test content'))) def test_download_man_page_when_a2x_fails(self):

1 0

[stem/master] Add TorTP to examples page
by atagar＠torproject.org 28 Jan '16

28 Jan '16

commit a35f80ca4994fb76e2b7ae1db2fb4be5fe9f5030 Author: Damian Johnson <atagar(a)torproject.org> Date: Thu Jan 28 09:24:53 2016 -0800 Add TorTP to examples page TorTP's new version uses stem to determine the iptables rules to make. Adding it to our examples page. --- docs/tutorials/double_double_toil_and_trouble.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index bae1ec5..54df821 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -74,6 +74,7 @@ Applications `OnionShare <https://github.com/micahflee/onionshare>`_ Hidden service based file sharing application. `Syboa <https://gitorious.org/syboa/syboa>`_ GTK Tor interface similar to `TorK <http://sourceforge.net/projects/tork/>`_. `hs-health <https://gitlab.com/hs-health/hs-health>`_ Experiment to measure churn and reachability of hidden services. +`TorTP <https://github.com/vinc3nt/stem-tortp>`_ Configures iptables to torify all traffic. =========================================================================================================== ========== Scripts

1 0

[metrics-web/master] Add Contributor's guide to the Metrics website.
by karsten＠torproject.org 28 Jan '16

28 Jan '16

commit 5611ef4563453ac74ada78299d0972c166b83230 Author: Karsten Loesing <karsten.loesing(a)gmx.net> Date: Thu Jan 28 18:00:20 2016 +0100 Add Contributor's guide to the Metrics website. --- CONTRIB.md | 89 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/CONTRIB.md b/CONTRIB.md new file mode 100644 index 0000000..4f36afe --- /dev/null +++ b/CONTRIB.md @@ -0,0 +1,89 @@ +Contributor's guide to the Metrics website + +Dear contributor to the Metrics website. This guide shall help you +understand the design decisions behind building the Metrics website and +give you starting points where you should look to make it bigger and +better. + +First of all, let's talk briefly about the scope of the Metrics website, +which we'll be calling Metrics in the following. + + - What Metrics is: Metrics is supposed to provide easy access to Tor + network data. The typical Metrics user is neither a researcher nor a + developer and is just looking for an easy way to learn more about this + Tor network they have been hearing about. Metrics is giving them data + in visual or tabular form, together with explanations that are easy to + understand with as little technical language as possible. + + - What Metrics is not: The typical Tor researcher or Tor developer would + probably want to dive deeper into the data to learn even more about the + Tor network. But in contrast to the average Metrics user they could + just fetch the original data from CollecTor and run their own analysis. + Metrics is not trying to be the solution for everyone. If we have to + choose, we're aiming for simplicity instead of comprehensiveness. + +Now let's take a quick tour of the components that Metrics is made of. + + - Data-processing modules: The bulk of Metrics code is running in the + background, invisible to Metrics users. It's the code that takes + CollecTor data as input and that produces .csv files that are the basis + for graphs and tables on Metrics. There's usually one such module per + generated .csv file that focuses on a different aspect of Tor network + data. All these modules are periodically executed by the system's cron + daemon, independent of user requests to the website part of Metrics. + See the modules/ subdirectory for the existing data-processing modules. + Note that modules don't have to be written in Java even though that's + currently the case for all of them. The only requirement is that + there's a shell script to run the module using packages available in + Debian stable. The remaining components of Metrics are all related to + its website part. + + - Start page: The website part of Metrics is organized into one page per + metric, which can be a graph, table, data file, or external link, and + the start page to browse available metrics. Each metric has attributes + like a descriptive name, one or more tags (relays, bridges, etc.), a + type (graph, table, etc.), and a level (basic or advanced). All + metrics are defined in `website/etc/metrics.json` and displayed in the + table on the start page. + + - Graph pages: The bulk of graph pages consist of graphing methods in + `website/rserve/graphs.R` that are written in R and using the ggplot2 + graphing library. These methods read one or more of the .csv files + produced by data-processing modules and produce a graph image as + output. Graphs have a few additional attributes in + `website/etc/metrics.json` like a description and parameters to + customize the graph. As of writing this guide, there's one exception + with the bubble graph which is implemented using JavaScript library + D3.js and which might soon be generated on the server using Node.js. + + - Table pages: Metrics also provides a few aspects of Tor network data in + tabular form with customization options. Like graphs, the data in + these tables is provided using R by reading the previously generated + .csv files. All relevant R code for generating table data is located + in `website/rserve/tables.R`. Again, there are additional attributes + in `website/etc/metrics.json` that define what parameters are available + to customize table contents and how to format results. + + - Data pages: While most Metrics user are not expected to run their own + analyses based on raw Tor network data, some of them might want to look + deeper into the data they saw in a graph or table. Metrics provides + all pre-aggregated output from its data-processing modules as + downloadable .csv files and also documents these file formats in + sufficient detail for Metrics users to use them. + + - Link pages: Metrics is not the only game in town, and it's great that + other developers take the publicly available Tor network data and + visualize it in a different way. Metrics acknowledges these efforts by + adding link pages with thumbnails to make it easy for Metrics users to + find those external visualizations. + + - About page: Most Metrics users have a basic understanding of how Tor + works, most likely from reading the main Tor website. But Metrics + should give its users enough explanations to understand where all the + Tor network data comes from and how that data is used to learn + interesting facts about the Tor network. That's where the About page + comes into play. The About page consists of a list of frequently used + terms and a second list of frequently asked questions. There could be + more documentation, but more text doesn't necessarily mean that users + will read more. +

1 0

[tor/master] Try to fix formatting in manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit 601c82325549c00fb6d3c507c87b3224de44fa3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:52:48 2016 -0500 Try to fix formatting in manpage --- doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0f605ff..c011bff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,8 +95,7 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. -[[opt-keygen]] **--keygen** [**--newpass**] - +[[opt-keygen]] **--keygen** [**--newpass**]:: Running "tor --keygen" creates a new ed25519 master identity key for a relay, or only a fresh temporary signing key and certificate, if you already have a master key. Optionally you can encrypt the master identity

1 0

[tor/master] Merge branch 'maint-0.2.7'
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit a5bed4dab2f8521f744d5137e4f439b073c7e5e9 Merge: 6b2087d 601c823 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:53:03 2016 -0500 Merge branch 'maint-0.2.7' doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)

1 0

[tor/maint-0.2.7] Try to fix formatting in manpage
by nickm＠torproject.org 28 Jan '16

28 Jan '16

commit 601c82325549c00fb6d3c507c87b3224de44fa3f Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Jan 28 11:52:48 2016 -0500 Try to fix formatting in manpage --- doc/tor.1.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/doc/tor.1.txt b/doc/tor.1.txt index 0f605ff..c011bff 100644 --- a/doc/tor.1.txt +++ b/doc/tor.1.txt @@ -95,8 +95,7 @@ COMMAND-LINE OPTIONS which tells Tor to only send warnings and errors to the console, or with the **--quiet** option, which tells Tor not to log to the console at all. -[[opt-keygen]] **--keygen** [**--newpass**] - +[[opt-keygen]] **--keygen** [**--newpass**]:: Running "tor --keygen" creates a new ed25519 master identity key for a relay, or only a fresh temporary signing key and certificate, if you already have a master key. Optionally you can encrypt the master identity

1 0