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

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 106f45032633b09c8a2cf3b440b58bb30826bb5a Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 17:45:40 2014 +0000 Update translations for tails-misc_completed --- de.po | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/de.po b/de.po index 9301447..d01d2cc 100644 --- a/de.po +++ b/de.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 23:10+0000\n" -"Last-Translator: rike <u(a)451f.org>\n" +"PO-Revision-Date: 2014-03-26 17:40+0000\n" +"Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -372,7 +372,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "<b>Nicht genügend Speicher vorhanden, um nach Upgrades zu suchen.</b>\nStellen Sie sicher, dass dieses System den Minimalanforderungen für Tails entspricht.\nSiehe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nStarten Sie Tails noch einmal, um erneut nach Upgrades zu suchen.\n\nOder aktualisieren Sie manuell.\nBeachten Sie dazu https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "<b>Nicht genügend Speicher vorhanden, um nach Aktualisierungen zu suchen.</b>\n\nStellen Sie bitte sicher, dass dieses System den Minimalanforderungen für Tails entspricht.\nSiehe: file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nVersuchen Sie Tails neu zu starten, um erneut nach Aktualisierungen zu suchen.\n\nOder führen Sie eine manuelle Aktualisierung durch.\nBeachten Sie bitte dazu: https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 1d7aa30dbe13d6e6b8c085fd0819345c7008ff05 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 17:45:37 2014 +0000 Update translations for tails-misc --- cy.po | 79 +++++++++++++++++++++++++++++++++-------------------------------- de.po | 6 ++--- 2 files changed, 43 insertions(+), 42 deletions(-) diff --git a/cy.po b/cy.po index a7fab51..fec5944 100644 --- a/cy.po +++ b/cy.po @@ -4,13 +4,14 @@ # # Translators: # huwwaters <huwwaters(a)gmail.com>, 2014 +# littlegreykida <theinfinitygap(a)gmail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 08:50+0000\n" -"Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" +"PO-Revision-Date: 2014-03-26 17:45+0000\n" +"Last-Translator: littlegreykida <theinfinitygap(a)gmail.com>\n" "Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -42,11 +43,11 @@ msgid "" "<p>Anyone who can see this reply will probably infer you are\n" "a Tails user. Time to wonder how much you trust your\n" "Internet and mailbox providers?</p>\n" -msgstr "" +msgstr "<h1>Helpwch ni atgyweirio'ch byg!</h1>\n<p>Darllenwch <a href=\"%s\">ein cyfarwyddiadau i adroddi bygiau</a>.</p>\n<p><strong>Peidiwch cynnwys fwy o gwybodaeth personol \nnag sydd rhaid!</strong></p>\n<h2>Amdan rhoi eich cyfeiriad e-bost</h2>\n<p>Os nad ydych yn poeni rhoi rhai rhannau o'ch hunaniaeth\ni'r datblygwyr Tails, gallwch rhoi e-bost i adael i ninnau ofyn\nam fwy o wybodaeth am y byg. Hefyd, wrth gynnwys allwedd\nPGP cyhoeddus, gallen ni amgryptio unrhyw cyfarthrebiad\ndyfodol.</p>\n<p>Bydd unrhyw un sydd gallu darllen y neges hon yn ôl pob tebyg \nyn tybu eich fod yn defnyddwyr Tails. Amser feddwl am faint o\nymddiriediaeth rydych yn rhoi i'ch datparwyr We ac e-bost?</p>\n" #: config/chroot_local-includes/usr/local/bin/gpgApplet:136 msgid "OpenPGP encryption applet" -msgstr "" +msgstr "Rhaglennig amgryptio OpenPGP" #: config/chroot_local-includes/usr/local/bin/gpgApplet:139 msgid "Exit" @@ -58,41 +59,41 @@ msgstr "Ynghylch" #: config/chroot_local-includes/usr/local/bin/gpgApplet:192 msgid "Encrypt Clipboard with _Passphrase" -msgstr "" +msgstr "Amgryptiwch y Clipfwrdd gydag _cyfrinair" #: config/chroot_local-includes/usr/local/bin/gpgApplet:195 msgid "Sign/Encrypt Clipboard with Public _Keys" -msgstr "" +msgstr "Llofnodi/Amgryptio'r Clipfwrdd efo Allweddi_Cyhoeddus" #: config/chroot_local-includes/usr/local/bin/gpgApplet:200 msgid "_Decrypt/Verify Clipboard" -msgstr "" +msgstr "Dadgryptio/Gwirio'r Clipfwrdd" #: config/chroot_local-includes/usr/local/bin/gpgApplet:204 msgid "_Manage Keys" -msgstr "" +msgstr "Rheoli Allweddi" #: config/chroot_local-includes/usr/local/bin/gpgApplet:244 msgid "The clipboard does not contain valid input data." -msgstr "" +msgstr "Nid yw'r clipfwrdd yn cynnwys data mewnbwn ddilys." #: config/chroot_local-includes/usr/local/bin/gpgApplet:294 #: config/chroot_local-includes/usr/local/bin/gpgApplet:296 #: config/chroot_local-includes/usr/local/bin/gpgApplet:298 msgid "Unknown Trust" -msgstr "" +msgstr "Ymddiriediaeth anhysbys" #: config/chroot_local-includes/usr/local/bin/gpgApplet:300 msgid "Marginal Trust" -msgstr "" +msgstr "Ymddiriediaeth ymylol" #: config/chroot_local-includes/usr/local/bin/gpgApplet:302 msgid "Full Trust" -msgstr "" +msgstr "Ymddiriediaeth llawn" #: config/chroot_local-includes/usr/local/bin/gpgApplet:304 msgid "Ultimate Trust" -msgstr "" +msgstr "Ymddiriediaeth terfynol" #: config/chroot_local-includes/usr/local/bin/gpgApplet:357 msgid "Name" @@ -100,7 +101,7 @@ msgstr "Enw" #: config/chroot_local-includes/usr/local/bin/gpgApplet:358 msgid "Key ID" -msgstr "" +msgstr "ID Allweddol" #: config/chroot_local-includes/usr/local/bin/gpgApplet:359 msgid "Status" @@ -108,80 +109,80 @@ msgstr "Statws" #: config/chroot_local-includes/usr/local/bin/gpgApplet:391 msgid "Fingerprint:" -msgstr "" +msgstr "Olion Bysedd:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:394 msgid "User ID:" msgid_plural "User IDs:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "ID Defnyddiwr:" +msgstr[1] "IDau Defnyddiwr:" +msgstr[2] "IDau Defnyddiwr:" +msgstr[3] "IDau Defnyddiwr:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:424 msgid "None (Don't sign)" -msgstr "" +msgstr "Ddim (Peidiwch llofnodi)" #: config/chroot_local-includes/usr/local/bin/gpgApplet:487 msgid "Select recipients:" -msgstr "" +msgstr "Dewiswch derbynwyr:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:495 msgid "Hide recipients" -msgstr "" +msgstr "Cyddiwch derbynwyr" #: config/chroot_local-includes/usr/local/bin/gpgApplet:498 msgid "" "Hide the user IDs of all recipients of an encrypted message. Otherwise " "anyone that sees the encrypted message can see who the recipients are." -msgstr "" +msgstr "Cyddiwch yr IDau o phob derbynwr o neges amgryptiedig. Neu gall unrhyw un sy'n gweld y neges amlgryptiedig gallu gweld pwy yw'r derbynwyr." #: config/chroot_local-includes/usr/local/bin/gpgApplet:504 msgid "Sign message as:" -msgstr "" +msgstr "Llofnodwch y neges fel:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:508 msgid "Choose keys" -msgstr "" +msgstr "Dewiswch allweddi" #: config/chroot_local-includes/usr/local/bin/gpgApplet:548 msgid "Do you trust these keys?" -msgstr "" +msgstr "Ydych chi'n ymddiried yn yr allweddi rhain?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:551 msgid "The following selected key is not fully trusted:" msgid_plural "The following selected keys are not fully trusted:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Nid yw'r allwedd hon yn hollol ymddiriedig:" +msgstr[1] "Nid yw'r allweddi hyn yn hollol ymddiriedig:" +msgstr[2] "Nid yw'r allweddi hyn yn hollol ymddiriedig:" +msgstr[3] "Nid yw'r allweddi hyn yn hollol ymddiriedig:" #: config/chroot_local-includes/usr/local/bin/gpgApplet:569 msgid "Do you trust this key enough to use it anyway?" msgid_plural "Do you trust these keys enough to use them anyway?" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" +msgstr[0] "Ydych chi'n ymddirio digon yn yr allwedd hon i'w ddefnyddio?" +msgstr[1] "Ydych chi'n ymddirio digon yn yr allweddi hyn i'w ddefnyddio?" +msgstr[2] "Ydych chi'n ymddirio digon yn yr allweddi hyn i'w ddefnyddio?" +msgstr[3] "Ydych chi'n ymddirio digon yn yr allweddi hyn i'w ddefnyddio?" #: config/chroot_local-includes/usr/local/bin/gpgApplet:582 msgid "No keys selected" -msgstr "" +msgstr "Ddim allweddi wedi'i ddewis" #: config/chroot_local-includes/usr/local/bin/gpgApplet:584 msgid "" "You must select a private key to sign the message, or some public keys to " "encrypt the message, or both." -msgstr "" +msgstr "Maen rhaid i chithau dewis allwedd preifat i llofnodi'r neges, neu rhai allweddi gyhoeddus i amgryptio'r neges, neu'r ddwy." #: config/chroot_local-includes/usr/local/bin/gpgApplet:612 msgid "No keys available" -msgstr "" +msgstr "Ddim allweddi ar gael" #: config/chroot_local-includes/usr/local/bin/gpgApplet:614 msgid "" "You need a private key to sign messages or a public key to encrypt messages." -msgstr "" +msgstr "Rydych chi angen allwedd preifat i llofnodi negeseuon, neu allwedd gyhoeddus i amgryptio negeseuon." #: config/chroot_local-includes/usr/local/bin/gpgApplet:742 msgid "GnuPG error" @@ -189,7 +190,7 @@ msgstr "Gwall GnuPG" #: config/chroot_local-includes/usr/local/bin/gpgApplet:763 msgid "Therefore the operation cannot be performed." -msgstr "" +msgstr "Felly, ni all yr gweithred fynd ymlaen." #: config/chroot_local-includes/usr/local/bin/gpgApplet:813 msgid "GnuPG results" diff --git a/de.po b/de.po index 9301447..d01d2cc 100644 --- a/de.po +++ b/de.po @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2014-03-23 08:55+0100\n" -"PO-Revision-Date: 2014-03-23 23:10+0000\n" -"Last-Translator: rike <u(a)451f.org>\n" +"PO-Revision-Date: 2014-03-26 17:40+0000\n" +"Last-Translator: to_ba\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -372,7 +372,7 @@ msgid "" "\n" "Or do a manual upgrade.\n" "See https://tails.boum.org/doc/first_steps/upgrade#manual" -msgstr "<b>Nicht genügend Speicher vorhanden, um nach Upgrades zu suchen.</b>\nStellen Sie sicher, dass dieses System den Minimalanforderungen für Tails entspricht.\nSiehe file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nStarten Sie Tails noch einmal, um erneut nach Upgrades zu suchen.\n\nOder aktualisieren Sie manuell.\nBeachten Sie dazu https://tails.boum.org/doc/first_steps/upgrade#manual" +msgstr "<b>Nicht genügend Speicher vorhanden, um nach Aktualisierungen zu suchen.</b>\n\nStellen Sie bitte sicher, dass dieses System den Minimalanforderungen für Tails entspricht.\nSiehe: file:///usr/share/doc/tails/website/doc/about/requirements.en.html\n\nVersuchen Sie Tails neu zu starten, um erneut nach Aktualisierungen zu suchen.\n\nOder führen Sie eine manuelle Aktualisierung durch.\nBeachten Sie bitte dazu: https://tails.boum.org/doc/first_steps/upgrade#manual" #: config/chroot_local-includes/usr/local/bin/tails-virt-notify-user:53 msgid "Warning: virtual machine detected!"

1 0

[stem/master] Moving "Determine The Exit You’re Using" to the example scripts
by atagar＠torproject.org 26 Mar '14

26 Mar '14

commit 3299a5ad68c85d6f33f20b7cbeb68ee175877d16 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 26 09:01:04 2014 -0700 Moving "Determine The Exit You’re Using" to the example scripts Moving this example from our client usage tutorials to the example scripts. This is a good standalone example, and unrelated to the other tasks in the tutorial. --- docs/contents.rst | 1 + docs/tutorials/double_double_toil_and_trouble.rst | 9 ++- docs/tutorials/examples/compare_flags.rst | 20 +++--- docs/tutorials/examples/exit_used.rst | 73 +++++++++++++++++++++ docs/tutorials/to_russia_with_love.rst | 72 -------------------- 5 files changed, 92 insertions(+), 83 deletions(-) diff --git a/docs/contents.rst b/docs/contents.rst index d9b6159..70eda0f 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -13,6 +13,7 @@ Contents tutorials/double_double_toil_and_trouble tutorials/examples/compare_flags + tutorials/examples/exit_used change_log download diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 3dabc1a..093592e 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -53,11 +53,18 @@ Applications Scripts ======= +Client Usage +------------ + +* `Determine The Exit You're Using <examples/exit_used.html>`_ + + Tells you the exit used for each Tor connection. + Descriptors ----------- * `Comparing Directory Authority Flags <examples/compare_flags.html>`_ Compares the votes of two directory authorities, in this case moria1 and - maatuska, with a special interest in the 'Running' flag. + maatuska with a special interest in the 'Running' flag. diff --git a/docs/tutorials/examples/compare_flags.rst b/docs/tutorials/examples/compare_flags.rst index b0f7fc6..8aceefc 100644 --- a/docs/tutorials/examples/compare_flags.rst +++ b/docs/tutorials/examples/compare_flags.rst @@ -6,16 +6,6 @@ maatuska, with a special interest in the 'Running' flag. :: - % python compare_flags.py - maatuska has the Running flag but moria1 doesn't: 92FCB6748A40E6088E22FBAB943AB2DD743EA818 - maatuska has the Running flag but moria1 doesn't: 6871F682350BA931838C0EC1E4A23044DAE06A73 - maatuska has the Running flag but moria1 doesn't: E2BB13AA2F6960CD93ABE5257A825687F3973C62 - moria1 has the Running flag but maatuska doesn't: 546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE - moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61 - ... - -:: - from stem.descriptor import DocumentHandler, remote # Query all authority votes asynchronously. @@ -58,3 +48,13 @@ maatuska, with a special interest in the 'Running' flag. elif 'Running' in maatuska_vote.flags and 'Running' not in moria1_vote.flags: print "maatuska has the Running flag but moria1 doesn't: %s" % fingerprint +:: + + % python compare_flags.py + maatuska has the Running flag but moria1 doesn't: 92FCB6748A40E6088E22FBAB943AB2DD743EA818 + maatuska has the Running flag but moria1 doesn't: 6871F682350BA931838C0EC1E4A23044DAE06A73 + maatuska has the Running flag but moria1 doesn't: E2BB13AA2F6960CD93ABE5257A825687F3973C62 + moria1 has the Running flag but maatuska doesn't: 546C54E2A89D88E0794D04AECBF1AC8AC9DA81DE + moria1 has the Running flag but maatuska doesn't: DCAEC3D069DC39AAE43D13C8AF31B5645E05ED61 + ... + diff --git a/docs/tutorials/examples/exit_used.rst b/docs/tutorials/examples/exit_used.rst new file mode 100644 index 0000000..2c27f98 --- /dev/null +++ b/docs/tutorials/examples/exit_used.rst @@ -0,0 +1,73 @@ +Determine The Exit You're Using +=============================== + +Lets say you're using Tor and one day you run into something odd. Maybe a +misconfigured relay, or maybe one that's being malicious. How can you figure +out what exit you're using? + +Here's a simple script that prints information about the exits used to service +the requests going through Tor... + +:: + + import functools + + from stem import StreamStatus + from stem.control import EventType, Controller + + def main(): + print "Tracking requests for tor exits. Press 'enter' to end." + print + + with Controller.from_port() as controller: + controller.authenticate() + + stream_listener = functools.partial(stream_event, controller) + controller.add_event_listener(stream_listener, EventType.STREAM) + + raw_input() # wait for user to press enter + + + def stream_event(controller, event): + if event.status == StreamStatus.SUCCEEDED: + circ = controller.get_circuit(event.circ_id) + + exit_fingerprint = circ.path[-1][0] + exit_relay = controller.get_network_status(exit_fingerprint) + + print "Exit relay for our connection to %s" % (event.target) + print " address: %s:%i" % (exit_relay.address, exit_relay.or_port) + print " fingerprint: %s" % exit_relay.fingerprint + print " nickname: %s" % exit_relay.nickname + print " locale: %s" % controller.get_info("ip-to-country/%s" % exit_relay.address, 'unknown') + print + + + if __name__ == '__main__': + main() + +Now if you make a request over Tor... + +:: + + % curl --socks4a 127.0.0.1:9050 google.com + <HTML><HEAD><meta http-equiv="content-type" content="text/html;charset=utf-8"> + <TITLE>301 Moved</TITLE></HEAD><BODY> + <H1>301 Moved</H1> + The document has moved + <A HREF="http://www.google.com/">here</A>. + </BODY></HTML> + +... this script will tell you about the exit... + +:: + + % python exit_used.py + Tracking requests for tor exits. Press 'enter' to end. + + Exit relay for our connection to 64.15.112.44:80 + address: 31.172.30.2:443 + fingerprint: A59E1E7C7EAEE083D756EE1FF6EC31CA3D8651D7 + nickname: chaoscomputerclub19 + locale: unknown + diff --git a/docs/tutorials/to_russia_with_love.rst b/docs/tutorials/to_russia_with_love.rst index e69e828..33c04d3 100644 --- a/docs/tutorials/to_russia_with_love.rst +++ b/docs/tutorials/to_russia_with_love.rst @@ -4,7 +4,6 @@ To Russia With Love * :ref:`using-socksipy` * :ref:`using-pycurl` * :ref:`reading-twitter` -* :ref:`determine-the-exit-you-re-using` .. _using-socksipy: @@ -173,74 +172,3 @@ Now lets do somthing a little more interesting, and read a Twitter feed over Tor .. image:: /_static/twitter_output.png -.. _determine-the-exit-you-re-using: - -Determine The Exit You're Using ---------------------------------- - -Finally, lets say you're using Tor and one day you run into something odd. Maybe a misconfigured relay, or maybe one that's being malicious. How can you figure out what exit you're using? - -Here's a simple script that prints information about the exits used to service the requests going through Tor... - -:: - - import functools - - from stem import StreamStatus - from stem.control import EventType, Controller - - def main(): - print "Tracking requests for tor exits. Press 'enter' to end." - print - - with Controller.from_port() as controller: - controller.authenticate() - - stream_listener = functools.partial(stream_event, controller) - controller.add_event_listener(stream_listener, EventType.STREAM) - - raw_input() # wait for user to press enter - - - def stream_event(controller, event): - if event.status == StreamStatus.SUCCEEDED: - circ = controller.get_circuit(event.circ_id) - - exit_fingerprint = circ.path[-1][0] - exit_relay = controller.get_network_status(exit_fingerprint) - - print "Exit relay for our connection to %s" % (event.target) - print " address: %s:%i" % (exit_relay.address, exit_relay.or_port) - print " fingerprint: %s" % exit_relay.fingerprint - print " nickname: %s" % exit_relay.nickname - print " locale: %s" % controller.get_info("ip-to-country/%s" % exit_relay.address, 'unknown') - print - - - if __name__ == '__main__': - main() - -Now if you make a request over Tor... - -:: - - % curl --socks4a 127.0.0.1:9050 google.com - <HTML><HEAD><meta http-equiv="content-type" content="text/html;charset=utf-8"> - <TITLE>301 Moved</TITLE></HEAD><BODY> - <H1>301 Moved</H1> - The document has moved - <A HREF="http://www.google.com/">here</A>. - </BODY></HTML> - -... this script will tell you about the exit... - -:: - - % python example.py - Tracking requests for tor exits. Press 'enter' to end. - - Exit relay for our connection to 64.15.112.44:80 - address: 31.172.30.2:443 - fingerprint: A59E1E7C7EAEE083D756EE1FF6EC31CA3D8651D7 - nickname: chaoscomputerclub19 - locale: unknown

1 0

[stem/master] Making CircuitEvent sortable
by atagar＠torproject.org 26 Mar '14

26 Mar '14

commit 4e81cb78d00d3d0b375261829b7f14a1671b0192 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 26 09:42:28 2014 -0700 Making CircuitEvent sortable Circuits should be sortable by their id. Making that the case so the following works... for circ in sorted(controller.get_circuits()): ... do stuff... --- stem/response/events.py | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/stem/response/events.py b/stem/response/events.py index b0bebfb..250697d 100644 --- a/stem/response/events.py +++ b/stem/response/events.py @@ -373,6 +373,43 @@ class CircuitEvent(Event): self._log_if_unrecognized('reason', stem.CircClosureReason) self._log_if_unrecognized('remote_reason', stem.CircClosureReason) + def _compare(self, other, method): + if not isinstance(other, CircuitEvent): + return False + + for attr in ('id', 'status', 'path', 'build_flags', 'purpose', 'hs_state', 'rend_query', 'created', 'reason', 'remote_reason'): + my_attr = getattr(self, attr) + other_attr = getattr(other, attr) + + # Our id attribute is technically a string, but Tor conventionally uses + # ints. Attempt to handle as ints if that's the case so we get numeric + # ordering. + + if attr == 'id' and my_attr and other_attr: + if my_attr.isdigit() and other_attr.isdigit(): + my_attr = int(my_attr) + other_attr = int(other_attr) + + if my_attr is None: + my_attr = '' + + if other_attr is None: + other_attr = '' + + if my_attr != other_attr: + return method(my_attr, other_attr) + + return True + + def __eq__(self, other): + return self._compare(other, lambda s, o: s == o) + + def __gt__(self, other): + return self._compare(other, lambda s, o: s > o) + + def __ge__(self, other): + return self._compare(other, lambda s, o: s >= o) + class CircMinorEvent(Event): """

1 0

[stem/master] Adding example for listing outdated relays
by atagar＠torproject.org 26 Mar '14

26 Mar '14

commit 79e924a9e7dc2f193c1869e9e36aea20292e076a Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 26 09:18:40 2014 -0700 Adding example for listing outdated relays Adding our script from ticket 9476 which prints contact information for relays prior to a given version. I picked example output that was especially obscured addresses, then modified them further to make them useless to scrapers. ;) --- docs/contents.rst | 1 + docs/tutorials/double_double_toil_and_trouble.rst | 4 +++ docs/tutorials/examples/outdated_relays.rst | 40 +++++++++++++++++++++ 3 files changed, 45 insertions(+) diff --git a/docs/contents.rst b/docs/contents.rst index 70eda0f..4d79639 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -14,6 +14,7 @@ Contents tutorials/examples/compare_flags tutorials/examples/exit_used + tutorials/examples/outdated_relays change_log download diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 093592e..7e39eb8 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -63,6 +63,10 @@ Client Usage Descriptors ----------- +* `List Outdated Relays <examples/outdated_relays.html>`_ + + Prints contact information for relays prior to a given version. + * `Comparing Directory Authority Flags <examples/compare_flags.html>`_ Compares the votes of two directory authorities, in this case moria1 and diff --git a/docs/tutorials/examples/outdated_relays.rst b/docs/tutorials/examples/outdated_relays.rst new file mode 100644 index 0000000..8e11258 --- /dev/null +++ b/docs/tutorials/examples/outdated_relays.rst @@ -0,0 +1,40 @@ +List Outdated Relays +==================== + +Time marches on. Tor makes new releases, and at some point needs to drop support for old ones. Below is the script we used on :trac:`9476` to reach out to relay operators that needed to upgrade. + +:: + + from stem.descriptor.remote import DescriptorDownloader + from stem.version import Version + + downloader = DescriptorDownloader() + count, with_contact = 0, 0 + + print "Checking for outdated relays..." + print + + for desc in downloader.get_server_descriptors(): + if desc.tor_version < Version('0.2.3.0'): + count += 1 + + if desc.contact: + print ' %-15s %s' % (desc.tor_version, desc.contact.decode("utf-8", "replace")) + with_contact += 1 + + print + print "%i outdated relays found, %i had contact information" % (count, with_contact) + +:: + + % python outdated_relays.py + Checking for outdated relays... + + 0.2.2.39 Random Person admin(a)gtr-10.de + 0.2.2.36 dobrovich_psckaal at vietrievus dot ok + 0.2.2.39 anonymous6 anonymous(a)mailinator.com + 0.2.2.39 anonymous12 anonymous(a)mailinator.com + ... + + 316 outdated relays found, 120 had contact information +

1 0

[stem/master] Adding an example for listing circuit information
by atagar＠torproject.org 26 Mar '14

26 Mar '14

commit 55f062fa9770319cf92fdd0d4439a554593a24b8 Author: Damian Johnson <atagar(a)torproject.org> Date: Wed Mar 26 09:57:55 2014 -0700 Adding an example for listing circuit information This is an adapted from of the 'How do I get information about my exits?' FAQ entry I recently removed. Unlike that example, this provides information about the full circuit rather than just the last hop. --- docs/contents.rst | 1 + docs/tutorials/double_double_toil_and_trouble.rst | 4 ++ docs/tutorials/examples/list_circuits.rst | 49 +++++++++++++++++++++ 3 files changed, 54 insertions(+) diff --git a/docs/contents.rst b/docs/contents.rst index 4d79639..9555673 100644 --- a/docs/contents.rst +++ b/docs/contents.rst @@ -14,6 +14,7 @@ Contents tutorials/examples/compare_flags tutorials/examples/exit_used + tutorials/examples/list_circuits tutorials/examples/outdated_relays change_log diff --git a/docs/tutorials/double_double_toil_and_trouble.rst b/docs/tutorials/double_double_toil_and_trouble.rst index 7e39eb8..64b2a3c 100644 --- a/docs/tutorials/double_double_toil_and_trouble.rst +++ b/docs/tutorials/double_double_toil_and_trouble.rst @@ -56,6 +56,10 @@ Scripts Client Usage ------------ +* `List Circuits <examples/list_circuits.html>`_ + + List the path Tor uses for its present circuits. + * `Determine The Exit You're Using <examples/exit_used.html>`_ Tells you the exit used for each Tor connection. diff --git a/docs/tutorials/examples/list_circuits.rst b/docs/tutorials/examples/list_circuits.rst new file mode 100644 index 0000000..9f4fb93 --- /dev/null +++ b/docs/tutorials/examples/list_circuits.rst @@ -0,0 +1,49 @@ +List Circuits +============= + +Tor creates new circuits and tears down old ones on your behalf, so how can you +get information about circuits Tor currently has available? + +:: + + from stem import CircStatus + from stem.control import Controller + + with Controller.from_port(port = 9051) as controller: + controller.authenticate() + + for circ in sorted(controller.get_circuits()): + if circ.status != CircStatus.BUILT: + continue + + print + print "Circuit %s (%s)" % (circ.id, circ.purpose) + + for i, entry in enumerate(circ.path): + div = '+' if (i == len(circ.path) - 1) else '|' + fingerprint, nickname = entry + + desc = controller.get_network_status(fingerprint, None) + address = desc.address if desc else 'unknown' + + print " %s- %s (%s, %s)" % (div, fingerprint, nickname, address) + +:: + + % python list_circuits.py + + Circuit 4 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- 0DD9935C5E939CFA1E07B8DDA6D91C1A2A9D9338 (afo02, 87.238.194.176) + +- DB3B1CFBD3E4D97B84B548ADD5B9A31451EEC4CC (edwardsnowden3, 109.163.234.10) + + Circuit 6 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- EC01CB4766BADC1611678555CE793F2A7EB2D723 (sprockets, 46.165.197.96) + +- 9EA317EECA56BDF30CAEB208A253FB456EDAB1A0 (bolobolo1, 96.47.226.20) + + Circuit 10 (GENERAL) + |- B1FA7D51B8B6F0CB585D944F450E7C06EDE7E44C (ByTORAndTheSnowDog, 173.209.180.61) + |- 00C2C2A16AEDB51D5E5FB7D6168FC66B343D822F (ph3x, 86.59.119.83) + +- 65242C91BFF30F165DA4D132C81A9EBA94B71D62 (torexit16, 176.67.169.171) +

1 0

[translation/https_everywhere_completed] Update translations for https_everywhere_completed
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit afbab8cc3c94ddb7301c84b8335a451c41e62577 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 16:45:19 2014 +0000 Update translations for https_everywhere_completed --- cy/https-everywhere.properties | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/cy/https-everywhere.properties b/cy/https-everywhere.properties new file mode 100644 index 0000000..2f209d3 --- /dev/null +++ b/cy/https-everywhere.properties @@ -0,0 +1,8 @@ +https-everywhere.menu.globalEnable = Galluogi HTTPS Everywhere +https-everywhere.menu.globalDisable = Analluogi HTTPS Everywhere +https-everywhere.menu.enableDisable = Galluogi / Analluogi Rheolau +https-everywhere.menu.noRules = (Ddim rheolau am yr tudalen hon) +https-everywhere.menu.unknownRules = (Rheolau anwybodus am yr tudalen hon) +https-everywhere.toolbar.hint = Mae HTTPS Everywhere yn awr yn gweithredol! Gallwch toglo hi ar sail wefan-wrth-wefan gan pwyso'r eicon yn y bar gyfeiriad. +https-everywhere.migration.notification0 = Felly gallen ni osod ateb holl bwysig, mae'r diweddariad hon yn ailosod eich rheolau dewisiadol HTTPS Everywhere i'w gwerthoedd diofyn. +https-everywhere.menu.ruleset-tests = Rhedeg profion set rheol HTTPS Everywhere

1 0

[translation/https_everywhere] Update translations for https_everywhere
by translation＠torproject.org 26 Mar '14

26 Mar '14

commit 59672ba1c77e55fd20428402fa06ba9b023de3a6 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 26 16:45:15 2014 +0000 Update translations for https_everywhere --- cy/https-everywhere.properties | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/cy/https-everywhere.properties b/cy/https-everywhere.properties index a00e018..2f209d3 100644 --- a/cy/https-everywhere.properties +++ b/cy/https-everywhere.properties @@ -1,8 +1,8 @@ https-everywhere.menu.globalEnable = Galluogi HTTPS Everywhere https-everywhere.menu.globalDisable = Analluogi HTTPS Everywhere https-everywhere.menu.enableDisable = Galluogi / Analluogi Rheolau -https-everywhere.menu.noRules = (No Rules for This Page) -https-everywhere.menu.unknownRules = (Rules for This Page Unknown) -https-everywhere.toolbar.hint = HTTPS Everywhere is now active. You can toggle it on a site-by-site basis by clicking the icon in the address bar. -https-everywhere.migration.notification0 = In order to implement a crucial fix, this update resets your HTTPS Everywhere rule preferences to their default values. -https-everywhere.menu.ruleset-tests = Run HTTPS Everywhere Ruleset Tests +https-everywhere.menu.noRules = (Ddim rheolau am yr tudalen hon) +https-everywhere.menu.unknownRules = (Rheolau anwybodus am yr tudalen hon) +https-everywhere.toolbar.hint = Mae HTTPS Everywhere yn awr yn gweithredol! Gallwch toglo hi ar sail wefan-wrth-wefan gan pwyso'r eicon yn y bar gyfeiriad. +https-everywhere.migration.notification0 = Felly gallen ni osod ateb holl bwysig, mae'r diweddariad hon yn ailosod eich rheolau dewisiadol HTTPS Everywhere i'w gwerthoedd diofyn. +https-everywhere.menu.ruleset-tests = Rhedeg profion set rheol HTTPS Everywhere

1 0

[tor/master] Merge remote-tracking branch 'public/bug11296'
by nickm＠torproject.org 26 Mar '14

26 Mar '14

commit 0b43c499b20da76aca2d43f149b8291a8dfd90d5 Merge: 6da2544 e83eddd Author: Nick Mathewson <nickm(a)torproject.org> Date: Wed Mar 26 11:46:51 2014 -0400 Merge remote-tracking branch 'public/bug11296' changes/bug11296 | 3 +++ src/tools/tor-fw-helper/include.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-)

1 0

[tor/master] Add missing -Isrc/ext to tor-fw-helper/include.am
by nickm＠torproject.org 26 Mar '14

26 Mar '14

commit e83eddd113481eac5c717c95867f761190f229ea Author: Nick Mathewson <nickm(a)torproject.org> Date: Tue Mar 25 10:21:07 2014 -0400 Add missing -Isrc/ext to tor-fw-helper/include.am We need this now that tor-fw-helper will pull in siphash.h Fixes bug 11296; bugfix on 0.2.5.4-alpha where siphash.h was introduced. --- changes/bug11296 | 3 +++ src/tools/tor-fw-helper/include.am | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changes/bug11296 b/changes/bug11296 new file mode 100644 index 0000000..a281e39 --- /dev/null +++ b/changes/bug11296 @@ -0,0 +1,3 @@ + o Minor bugfixes: + - Allow tor-fw-helper to build again by adding src/ext to its + CPPFLAGS. Fixes bug 11296; bugfix on 0.2.5.4-alpha. diff --git a/src/tools/tor-fw-helper/include.am b/src/tools/tor-fw-helper/include.am index 275a0e2..1f862e6 100644 --- a/src/tools/tor-fw-helper/include.am +++ b/src/tools/tor-fw-helper/include.am @@ -33,4 +33,4 @@ endif src_tools_tor_fw_helper_tor_fw_helper_LDFLAGS = $(nat_pmp_ldflags) $(miniupnpc_ldflags) src_tools_tor_fw_helper_tor_fw_helper_LDADD = src/common/libor.a $(nat_pmp_ldadd) $(miniupnpc_ldadd) -lm @TOR_LIB_WS32@ -src_tools_tor_fw_helper_tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags) +src_tools_tor_fw_helper_tor_fw_helper_CPPFLAGS = $(nat_pmp_cppflags) $(miniupnpc_cppflags) -I"$(top_srcdir)/src/ext"

1 0