November 2013 - tor-commits - lists.torproject.org

[stem/master] Windows lacks the pwd module
by atagar＠torproject.org 09 Nov '13

09 Nov '13

commit 13d489c0b38e78cace3ea6758baa65ae7fd31e49 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 9 11:38:42 2013 -0800 Windows lacks the pwd module Python's pwd module is only available on Unix platforms. We didn't account for this, causing our system module to raise ImportErrors on Windows. Reported by realgame on... https://trac.torproject.org/10072 This regression was introduced by our 1.1.0 release (1.0.1 didn't use pwd), so cutting a hotfix release for this fix. --- stem/util/system.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/stem/util/system.py b/stem/util/system.py index 01eea06..db0943e 100644 --- a/stem/util/system.py +++ b/stem/util/system.py @@ -36,7 +36,6 @@ import ctypes import ctypes.util import os import platform -import pwd import subprocess import time @@ -657,6 +656,8 @@ def get_user(pid): if stem.util.proc.is_available(): try: + import pwd # only available on unix platforms + uid = stem.util.proc.get_uid(pid) if uid and uid.isdigit():

1 0

[stem/master] Stem release 1.1.1
by atagar＠torproject.org 09 Nov '13

09 Nov '13

commit b1fb3e7a2cbbef029f483f084da98940844a3058 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 9 11:44:43 2013 -0800 Stem release 1.1.1 --- stem/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stem/__init__.py b/stem/__init__.py index 5abe6a7..1d47783 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -368,7 +368,7 @@ Library for working with the tor process. =============== =========== """ -__version__ = '1.1.0' +__version__ = '1.1.1' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] Merge version 1.1.1 hotfix
by atagar＠torproject.org 09 Nov '13

09 Nov '13

commit c27dc313c0ead935bbc71e8b92938fe4a4b18168 Merge: e8c916b b1fb3e7 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 9 11:46:25 2013 -0800 Merge version 1.1.1 hotfix stem/__init__.py | 2 +- stem/util/system.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --cc stem/__init__.py index 9710d24,1d47783..0415152 --- a/stem/__init__.py +++ b/stem/__init__.py @@@ -366,35 -366,9 +366,35 @@@ Library for working with the tor proces **DISCARD** throwing out timeout value from when the network was down **RESUME** resumed calculations to determine the proper timeout =============== =========== + +.. data:: ConnectionType (enum) + + Purpose for a tor connection. Tor may provide types not in this enum. + + The meaning behind these values is a bit unclear, pending :trac:`10086`. + + =============== =========== + ConnectionType Description + =============== =========== + **OR** carrying traffic within the tor network + **DIR** fetching or sending tor descriptor data + **EXIT** carrying traffic between the tor network and an external destination + =============== =========== + +.. data:: TokenBucket (enum) + + Bucket categories of TB_EMPTY events. + + =============== =========== + TokenBucket Description + =============== =========== + **GLOBAL** global token bucket + **RELAY** relay token bucket + **ORCONN** bucket used for OR connections + =============== =========== """ - __version__ = '1.1.0-dev' -__version__ = '1.1.1' ++__version__ = '1.1.1-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] PEP8 issue with a test we recently added
by atagar＠torproject.org 09 Nov '13

09 Nov '13

commit a2f022a007440998417f6bf184da9db4be141fc4 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Nov 9 11:48:30 2013 -0800 PEP8 issue with a test we recently added Minor issue caused when we expanded our event tests... * /home/atagar/Desktop/stem/test/unit/response/events.py line 1266 - E203 whitespace before ':' line 1266 - E231 missing whitespace after ':' --- test/unit/response/events.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/unit/response/events.py b/test/unit/response/events.py index c3cdf7a..23e682e 100644 --- a/test/unit/response/events.py +++ b/test/unit/response/events.py @@ -1263,7 +1263,7 @@ class TestEvents(unittest.TestCase): self.assertEqual(None, event.inbound_time) self.assertEqual("19403", event.outbound_queue) self.assertEqual("15", event.outbound_connection) - self.assertEqual({'create_fast': 1, 'relay_early' :2}, event.outbound_added) + self.assertEqual({'create_fast': 1, 'relay_early': 2}, event.outbound_added) self.assertEqual({'create_fast': 1, 'relay_early': 2}, event.outbound_removed) self.assertEqual({'create_fast': 0, 'relay_early': 0}, event.outbound_time)

1 0

[translation/tor-launcher-network-settings] Update translations for tor-launcher-network-settings
by translation＠torproject.org 09 Nov '13

09 Nov '13

commit b65b459d544d666edeee0ad9cde887e67107de57 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 19:16:08 2013 +0000 Update translations for tor-launcher-network-settings --- hr_HR/network-settings.dtd | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/hr_HR/network-settings.dtd b/hr_HR/network-settings.dtd index 0e914c6..e9759b0 100644 --- a/hr_HR/network-settings.dtd +++ b/hr_HR/network-settings.dtd @@ -44,8 +44,8 @@ <!ENTITY torsettings.firewall.checkbox "Ovo računalo je iza vatrozida koji dopušta spajanje samo na određene portove"> <!ENTITY torsettings.firewall.allowedPorts "Dozvoljeni portovi:"> <!ENTITY torsettings.useBridges.checkbox "Moj pružatelj internetskih usluga (ISP) blokira veze prema Tor mreži"> -<!ENTITY torsettings.useBridges.label ""> -<!ENTITY torsettings.useBridges.placeholder ""> +<!ENTITY torsettings.useBridges.label "Unesite jedan ili više mostova (jedan po retku)."> +<!ENTITY torsettings.useBridges.placeholder "address:port OR transport address:port"> <!ENTITY torsettings.copyLog "Kopiraj Tor zapisnik u međuspremnik"> <!ENTITY torsettings.bridgeHelpTitle "Pomoć za bridge relej">

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Nov '13

09 Nov '13

commit 0859ac77fb7ebe071caccff0a735f4379577e80c Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 18:45:54 2013 +0000 Update translations for liveusb-creator --- de/de.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/de/de.po b/de/de.po index ed29981..ca6d2c9 100644 --- a/de/de.po +++ b/de/de.po @@ -22,7 +22,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-09 18:12+0000\n" +"PO-Revision-Date: 2013-11-09 18:20+0000\n" "Last-Translator: Victor1975 <VKerley75(a)gmail.com>\n" "Language-Team: German (http://www.transifex.com/projects/p/torproject/language/de/)\n" "MIME-Version: 1.0\n"

1 0

[translation/liveusb-creator] Update translations for liveusb-creator
by translation＠torproject.org 09 Nov '13

09 Nov '13

commit 1c4f23771a6dddfe262c0eee2df397558e516dd1 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Nov 9 18:15:54 2013 +0000 Update translations for liveusb-creator --- de/de.po | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/de/de.po b/de/de.po index 5d7b505..ed29981 100644 --- a/de/de.po +++ b/de/de.po @@ -16,13 +16,14 @@ # Cooligan <ppt23(a)lkj.hopto.org>, 2012 # Sacro <Scion(a)T-Online.de>, 2013 # Sacro <Scion(a)T-Online.de>, 2012 +# Victor1975 <VKerley75(a)gmail.com>, 2013 msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2013-10-17 13:19+0200\n" -"PO-Revision-Date: 2013-11-06 22:10+0000\n" -"Last-Translator: ivl1705 <listmember(a)rinnberger.de>\n" +"PO-Revision-Date: 2013-11-09 18:12+0000\n" +"Last-Translator: Victor1975 <VKerley75(a)gmail.com>\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" @@ -160,7 +161,7 @@ msgstr "Herunterladen fehlgeschlagen:" #: ../liveusb/gui.py:88 #, python-format msgid "Downloading %s..." -msgstr "Lade %s herunter..." +msgstr "Lade %s herunter... " #: ../liveusb/creator.py:1118 msgid "Drive is a loopback, skipping MBR reset" @@ -179,7 +180,7 @@ msgstr "Fehler beim Prüfen des Gerätes" msgid "" "Error: Cannot set the label or obtain the UUID of your device. Unable to " "continue." -msgstr "Fehler: Kann das Label nicht setzen oder die UUID Ihres Gerätes ermitteln. Kann nicht fortfahren." +msgstr "Fehler: Kann das Label nicht setzen oder die UUID Ihres Gerätes ermitteln. Kann nicht fortfahren. " #: ../liveusb/creator.py:376 msgid "" @@ -217,7 +218,7 @@ msgstr "Installation abgeschlossen!" #: ../liveusb/gui.py:279 #, python-format msgid "Installation complete! (%s)" -msgstr "Installation abgeschlossen! (%s)" +msgstr "Installation abgeschlossen! (%s) " #: ../liveusb/gui.py:626 msgid "Installation was completed. Press OK to close this program." @@ -229,7 +230,7 @@ msgstr "Installiere Bootloader..." #: ../liveusb/gui.py:284 msgid "LiveUSB creation failed!" -msgstr "LiveUSB-Erzeugung fehlgeschlagen!" +msgstr "LiveUSB-Erzeugung fehlgeschlagen! " #: ../liveusb/creator.py:1334 msgid "" @@ -250,7 +251,7 @@ msgstr "Mount %s existiert noch nach dem unmounten" #: ../liveusb/gui.py:568 #, python-format msgid "No free space on device %(device)s" -msgstr "Kein freier Speicher auf dem Gerät %(device)s" +msgstr "Kein freier Speicher auf dem Gerät %(device)s " #: ../liveusb/creator.py:802 msgid "No mount points found" @@ -409,7 +410,7 @@ msgstr "%(infile)s konnte nicht nach %(outfile)s kopiert werden: %(message)s" #: ../liveusb/gui.py:418 msgid "Unable to find any USB drive" -msgstr "Kein USB-Laufwerk gefunden" +msgstr "Kein USB-Laufwerk gefunden " #: ../liveusb/creator.py:1200 msgid "Unable to find any supported device" @@ -475,7 +476,7 @@ msgstr "Unbekanntes Dateisystem. Eventuell muss das Gerät neu formatiert werden #: ../liveusb/gui.py:84 #, python-format msgid "Unknown release: %s" -msgstr "Unbekannte Version: %s" +msgstr "Unbekannte Version: %s " #: ../liveusb/creator.py:827 #, python-format @@ -552,7 +553,7 @@ msgid "" "Warning: This tool needs to be run as an Administrator. To do this, right " "click on the icon and open the Properties. Under the Compatibility tab, " "check the \"Run this program as an administrator\" box." -msgstr "Warnung: Dieses Tool muss als Administrator ausgeführt werden. Um dies zu tun, klicken Sie mit der rechten Maustaste auf das Programmsymbol und öffnen Sie dort die Eigenschaften. Setzen Sie nun einen Haken bei \"Programm als Administrator ausführen\" im Reiter \"Kompatibilität\"." +msgstr "Warnung: Dieses Tool muss als Administrator ausgeführt werden. Um dies zu tun, klicken Sie mit der rechten Maustaste auf das Programmsymbol und öffnen Sie dort die Eigenschaften. Setzen Sie nun einen Haken bei \"Programm als Administrator ausführen\" im Reiter \"Kompatibilität\". " #: ../liveusb/creator.py:152 #, python-format

1 0

[goptlib/master] fmt.
by dcf＠torproject.org 09 Nov '13

09 Nov '13

commit 048af60fc63bfdc6222b5408ce16078584616874 Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 9 07:56:20 2013 -0800 fmt. --- pt_test.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pt_test.go b/pt_test.go index b479dcd..ada9ed5 100644 --- a/pt_test.go +++ b/pt_test.go @@ -41,7 +41,7 @@ func TestEscape(t *testing.T) { } func TestGetManagedTransportVer(t *testing.T) { - badTests := [...]string { + badTests := [...]string{ "", "2", }

1 0

[goptlib/master] Consistency in line output docs.
by dcf＠torproject.org 09 Nov '13

09 Nov '13

commit 8a743664facc676ca9db3b27efe5423e50b40a6c Author: David Fifield <david(a)bamsoftware.com> Date: Sat Nov 9 07:58:41 2013 -0800 Consistency in line output docs. --- pt.go | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pt.go b/pt.go index 8851dfe..b79f08b 100644 --- a/pt.go +++ b/pt.go @@ -130,22 +130,23 @@ func doError(keyword string, v ...string) *ptErr { return &ptErr{keyword, v} } -// Emit an ENV-ERROR with explanation text. Return the error as a ptErr. +// Emit an ENV-ERROR line with explanation text. Return the error as a ptErr. func EnvError(msg string) error { return doError("ENV-ERROR", msg) } -// Emit a VERSION-ERROR with explanation text. Return the error as a ptErr. +// Emit a VERSION-ERROR line with explanation text. Return the error as a ptErr. func VersionError(msg string) error { return doError("VERSION-ERROR", msg) } -// Emit a CMETHOD-ERROR with explanation text. Return the error as a ptErr. +// Emit a CMETHOD-ERROR line with explanation text. Return the error as a ptErr. func CmethodError(methodName, msg string) error { return doError("CMETHOD-ERROR", methodName, msg) } -// Emit an SMETHOD-ERROR with explanation text. Return the error as a ptErr. +// Emit an SMETHOD-ERROR line with explanation text. Return the error as a +// ptErr. func SmethodError(methodName, msg string) error { return doError("SMETHOD-ERROR", methodName, msg) }

1 0

[flashproxy/master] add more documentation on inner vs outer transports
by infinity0＠torproject.org 09 Nov '13

09 Nov '13

commit a96f70206da9c646bd7cb7fb6b1ca82a51dff548 Author: Ximin Luo <infinity0(a)gmx.com> Date: Sat Nov 9 15:44:28 2013 +0000 add more documentation on inner vs outer transports --- doc/design.txt | 34 +++++++++++++++++++++++++++++++++- facilitator/facilitator | 6 ++++-- 2 files changed, 37 insertions(+), 3 deletions(-) diff --git a/doc/design.txt b/doc/design.txt index 94f8403..319dd9c 100644 --- a/doc/design.txt +++ b/doc/design.txt @@ -206,4 +206,36 @@ Design of flash proxies 10. Inner and outer transports - TODO: import discussion from #9349. + The client can talk to the relay using not only the Tor protocol, but + any transport protocol implemented by e.g. another pluggable transport + that sits between tor and the flashproxy PT. For the facilitator to + match a client with a relay that understands it, flashproxy-client + must be given the name of the transport protocol, via the --transport + option. This is divided into two parts, the inner and outer transport, + written like "inner|outer" or just "outer" if the inner transport is + the plain Tor protocol. + + The inner transport is the protocol that the non-flashproxy parts of + the client and relay talk to each other with, and must be the same for + each connected pair. Beyond that, the semantics of the transport are + opaque to flashproxy; it does not know or care. + + The outer transports are the protocols that the browser proxy uses to + talk to the client and relay, and may be different for each. The proxy + un-applies the outer transport of the client so that only the inner + traffic remains, then re-applies the outer transport of the relay to + this and sends it to the relay; and vice-versa for traffic going in + the opposite direction. + + Diagram: + + client <======outer-C=======> proxy <======outer-S=======> relay + <=======inner=========-------========inner========> + + Currently the only supported outer transport is "websocket", but we + will also add support for newer technologies such as webRTC. + + (We have also seen third-party proxies running outside the browser + on NodeJS that can open plain TCP connections, so that the outer + transport is effectively just "tcp", although this is not currently + recognised by the facilitator.) diff --git a/facilitator/facilitator b/facilitator/facilitator index ebce31b..3bc8f92 100755 --- a/facilitator/facilitator +++ b/facilitator/facilitator @@ -140,9 +140,11 @@ class Endpoints(object): return True def _findInnerForOuter(self, *supported_outer): - """ + """Find all endpoint addresses that support any of the given outer + transports. Results are grouped by the inner transport. + :returns: { inner: [addr] }, where each address supports some outer - from supported_outer. TODO(infinity0): describe better + transport from supported_outer. """ inners = defaultdict(set) for outer in set(supported_outer) & set(self._indexes.iterkeys()):

1 0