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

r26820: {website} Add obfs4/obfsclient to the PT list. (website/trunk/docs/en)
by George Kadianakis 08 Jun '14

08 Jun '14

Author: asn Date: 2014-06-08 04:38:05 +0000 (Sun, 08 Jun 2014) New Revision: 26820 Modified: website/trunk/docs/en/pluggable-transports.wml Log: Add obfs4/obfsclient to the PT list. Modified: website/trunk/docs/en/pluggable-transports.wml =================================================================== --- website/trunk/docs/en/pluggable-transports.wml 2014-06-07 03:43:23 UTC (rev 26819) +++ website/trunk/docs/en/pluggable-transports.wml 2014-06-08 04:38:05 UTC (rev 26820) @@ -74,14 +74,35 @@ Status: To be deployed </li> - <li>Meek is a transport that uses HTTP for carrying bytes - and TLS for obfuscation. Traffic is relayed through a third-party - server (Google App Engine). It uses a trick to talk to the third - party so that it looks like it is talking to an unblocked server. + <li><a href="https://trac.torproject.org/projects/tor/wiki/doc/meek">Meek</a> + is a transport that uses HTTP for carrying bytes and TLS for + obfuscation. Traffic is relayed through a third-party server + (Google App Engine). It uses a trick to talk to the third party so + that it looks like it is talking to an unblocked server. Maintained by David Fifield. Status: <e>Coming soon </li> + <li><a href="https://github.com/Yawning/obfs4/blob/master/doc/obfs4-spec.txt">obfs4</a> + is a transport with the same features as <a href="http://www.cs.kau.se/philwint/scramblesuit/">ScrambleSuit</a> + but utilizing Dan Bernstein's <a href="http://elligator.cr.yp.to/elligator-20130828.pdf">elligator2 + technique for public key obfuscation, and the + <a href="https://gitweb.torproject.org/torspec.git/blob/HEAD:/proposals/216-ntor-han…">ntor protocol</a> + for one-way authentication. This results in a faster protocol. Written in Go. + Maintained by Yawning Angel. + Status: <e>Coming soon + </li> + + <li><a href="https://github.com/yawning/obfsclient">obfsclient</a> + is a multi-transport pluggable transport proxy (like obfsproxy), + written in C++ that implements the client-side of obfs2, + obfs3 and scramblesuit. It's used by + <a href="https://guardianproject.info/apps/orbot/">Orbot</a> on + Android because of the difficulties of using Python applications. + Maintained by Yawning Angel. + Status: <a href="https://guardianproject.info/apps/orbot/">Deployed</a> + </li> + <li>StegoTorus is an Obfsproxy fork that extends it to a) split Tor streams across multiple connections to avoid packet size signatures, and b) embed the traffic flows in traces that look like

1 0

[orbot/master] updating to 14.0.0 build 100!
by n8fr8＠torproject.org 08 Jun '14

08 Jun '14

commit 81bd61764c2c300bd1ba1e4de5b03350455470c1 Author: Nathan Freitas <nathan(a)freitas.net> Date: Sat Jun 7 23:10:17 2014 -0400 updating to 14.0.0 build 100! --- AndroidManifest.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index d7b1da8..f05d19a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.torproject.android" - android:versionName="14.0.0-RC3" - android:versionCode="99" + android:versionName="14.0.0" + android:versionCode="100" android:installLocation="auto" >

1 0

[arm/master] Fix invalid or_port type formatting when making labels
by atagar＠torproject.org 08 Jun '14

08 Jun '14

commit 1113293a533454f1922b1768e5d256a4475e341c Author: Patrick Mezard <patrick(a)mezard.eu> Date: Sat Jun 7 15:25:19 2014 -0700 Fix invalid or_port type formatting when making labels --- arm/header_panel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arm/header_panel.py b/arm/header_panel.py index 0c7e669..41992e4 100644 --- a/arm/header_panel.py +++ b/arm/header_panel.py @@ -251,7 +251,7 @@ class HeaderPanel(panel.Panel, threading.Thread): dir_port_label = ", Dir Port: %s" % self.vals.dir_port if self.vals.dir_port != "0" else "" - for label in (self.vals.nickname, " - " + my_address, ":" + self.vals.or_port, dir_port_label): + for label in (self.vals.nickname, " - " + my_address, ":%s" % self.vals.or_port, dir_port_label): if x + len(label) <= left_width: self.addstr(1, x, label) x += len(label)

1 0

[stem/master] Adding hotfix changes to our changelog
by atagar＠torproject.org 07 Jun '14

07 Jun '14

commit de7aca3b517c46d6485ce0464e6126216c592b1c Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 7 13:03:22 2014 -0700 Adding hotfix changes to our changelog We had a note for our 1.0.1 hotfix release, but none of the later ones. --- docs/change_log.rst | 9 +++++++++ stem/util/conf.py | 8 ++++---- 2 files changed, 13 insertions(+), 4 deletions(-) diff --git a/docs/change_log.rst b/docs/change_log.rst index 6e9a13c..ae0db05 100644 --- a/docs/change_log.rst +++ b/docs/change_log.rst @@ -92,6 +92,12 @@ among numerous other improvements and fixes. * Added a section with `example scripts <tutorials/double_double_toil_and_trouble.html#scripts>`_. * Made FAQ and other sections quite a bit more succinct. + * **Version 1.2.2** (June 7th, 2014) - fixed an issue where the stem.util.conf + module would fail under Python 2.6 with an AttributeError (:trac:`12223`) + + * **Version 1.2.1** (June 3rd, 2014) - fixed an issue where descriptor + parsersing would fail under Python 3.x with a TypeError + .. _version_1.1: Version 1.1 @@ -151,6 +157,9 @@ and a myriad of smaller improvements and fixes. <https://www.atagar.com/transfer/stem_frontpage/before.png>`_ and `after <https://www.atagar.com/transfer/stem_frontpage/after.png>`_). + * **Version 1.1.1** (November 9th, 2013) - fixed an issue where imports of stem.util.system + would fail with an ImportError for pwd under Windows (:trac:`10072`) + .. _version_1.0: Version 1.0 diff --git a/stem/util/conf.py b/stem/util/conf.py index 6443fba..702c27f 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -687,14 +687,14 @@ class Config(object): elif isinstance(default, tuple): val = tuple(val) elif isinstance(default, dict): - valMap = OrderedDict() + val_map = OrderedDict() for entry in val: if '=>' in entry: - entryKey, entryVal = entry.split('=>', 1) - valMap[entryKey.strip()] = entryVal.strip() + entry_key, entry_val = entry.split('=>', 1) + val_map[entry_key.strip()] = entry_val.strip() else: log.debug('Ignoring invalid %s config entry (expected a mapping, but "%s" was missing "=>")' % (key, entry)) - val = valMap + val = val_map return val

1 0

[stem/master] Merge version 1.2.2 hotfix
by atagar＠torproject.org 07 Jun '14

07 Jun '14

commit a91776a1e9ba546984698d02f219d82157e086c1 Merge: d81dafb ca0ea05 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 7 11:41:51 2014 -0700 Merge version 1.2.2 hotfix docs/index.rst | 2 +- stem/__init__.py | 2 +- stem/util/conf.py | 9 +++++++-- test/integ/descriptor/server_descriptor.py | 14 +++++++++----- 4 files changed, 18 insertions(+), 9 deletions(-) diff --cc stem/__init__.py index 9362e7b,46942aa..6b15abd --- a/stem/__init__.py +++ b/stem/__init__.py @@@ -421,7 -421,7 +421,7 @@@ Library for working with the tor proces ================= =========== """ - __version__ = '1.2.1-dev' -__version__ = '1.2.2' ++__version__ = '1.2.2-dev' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] Test used 'with' for tarfiles, breaking python 2.6
by atagar＠torproject.org 07 Jun '14

07 Jun '14

commit 16287558bc585af3f280ef601b9526032489d104 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 7 11:01:56 2014 -0700 Test used 'with' for tarfiles, breaking python 2.6 Integ tests couldn't pass with python 2.6 because we started using with for tarfiles. We already accounted for this in all our other tarfile uses - just a regression in a newly added test. --- test/integ/descriptor/server_descriptor.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/test/integ/descriptor/server_descriptor.py b/test/integ/descriptor/server_descriptor.py index 6d16add..fef9264 100644 --- a/test/integ/descriptor/server_descriptor.py +++ b/test/integ/descriptor/server_descriptor.py @@ -41,12 +41,16 @@ class TestServerDescriptor(unittest.TestCase): Fetch server descriptors via parse_file() for a tarfile object. """ - with tarfile.open(TARFILE_PATH) as tar_file: - descriptors = list(stem.descriptor.parse_file(tar_file)) - self.assertEqual(3, len(descriptors)) + # TODO: When dropping python 2.6 support we can go back to using the 'with' + # keyword here. - fingerprints = set([desc.fingerprint for desc in descriptors]) - self.assertEqual(TARFILE_FINGERPRINTS, fingerprints) + tar_file = tarfile.open(TARFILE_PATH) + descriptors = list(stem.descriptor.parse_file(tar_file)) + self.assertEqual(3, len(descriptors)) + + fingerprints = set([desc.fingerprint for desc in descriptors]) + self.assertEqual(TARFILE_FINGERPRINTS, fingerprints) + tar_file.close() def test_metrics_descriptor(self): """

1 0

[stem/master] Updating download links for the 1.2.2 hotfix release
by atagar＠torproject.org 07 Jun '14

07 Jun '14

commit 6ba7725534df08f3b0c25819fb83742848cd60a2 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 7 11:42:56 2014 -0700 Updating download links for the 1.2.2 hotfix release --- docs/download.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/download.rst b/docs/download.rst index 05d0248..b6b05e4 100644 --- a/docs/download.rst +++ b/docs/download.rst @@ -63,9 +63,9 @@ Download Signed releases and instructions for both Python 2.x and 3.x. You can install from its `tarball - <https://pypi.python.org/packages/source/s/stem/stem-1.2.1.tar.bz2>`_ + <https://pypi.python.org/packages/source/s/stem/stem-1.2.2.tar.bz2>`_ (`sig - <https://pypi.python.org/packages/source/s/stem/stem-1.2.1.tar.bz2.asc>`_), + <https://pypi.python.org/packages/source/s/stem/stem-1.2.2.tar.bz2.asc>`_), or if you have **pip** installed then getting stem can be as simple as...

1 0

[stem/master] Stem release 1.2.2
by atagar＠torproject.org 07 Jun '14

07 Jun '14

commit ca0ea05d3b9a127c9800b65dec3dc9e44c7c5968 Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 7 11:35:40 2014 -0700 Stem release 1.2.2 Hotfix release for our Python 2.6 support... https://trac.torproject.org/projects/tor/ticket/12223 --- docs/index.rst | 2 +- stem/__init__.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docs/index.rst b/docs/index.rst index 05ee23f..022a74d 100644 --- a/docs/index.rst +++ b/docs/index.rst @@ -1,7 +1,7 @@ Welcome to Stem! ================ -Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.1** (released June 3rd, 2014). +Stem is a Python controller library for `Tor <https://www.torproject.org/>`_. Like its predecessor, `TorCtl <https://gitweb.torproject.org/pytorctl.git>`_, it uses Tor's `control protocol <https://gitweb.torproject.org/torspec.git/blob/HEAD:/control-spec.txt>`_ to help developers program against the Tor process, enabling them to build things similar to `Vidalia <https://www.torproject.org/getinvolved/volunteer.html.en#project-vidalia>`_ and `arm <https://www.atagar.com/arm/>`_. Stem's latest version is **1.2.2** (released June 7th, 2014). .. Main Stem Logo Source: http://www.wpclipart.com/plants/assorted/P/plant_stem.png.html diff --git a/stem/__init__.py b/stem/__init__.py index 1ec50ab..46942aa 100644 --- a/stem/__init__.py +++ b/stem/__init__.py @@ -421,7 +421,7 @@ Library for working with the tor process. ================= =========== """ -__version__ = '1.2.1' +__version__ = '1.2.2' __author__ = 'Damian Johnson' __contact__ = 'atagar(a)torproject.org' __url__ = 'https://stem.torproject.org/'

1 0

[stem/master] Python 2.6 broken by OrderedDict usage
by atagar＠torproject.org 07 Jun '14

07 Jun '14

commit 2ebd329ff3c9079828d62529e1e01be9ba0cdf1d Author: Damian Johnson <atagar(a)torproject.org> Date: Sat Jun 7 10:55:53 2014 -0700 Python 2.6 broken by OrderedDict usage In our recent release I swapped our stem.util.conf to use an OrderedDict, breaking our support for python 2.6... % python2.6 ./run_tests.py --unit Traceback (most recent call last): File "./run_tests.py", line 465, in <module> main() File "./run_tests.py", line 119, in main test_config.load(os.path.join(STEM_BASE, "test", "settings.cfg")) File "/home/atagar/Desktop/stem/stem/util/conf.py", line 504, in load self.set(key, value, False) File "/home/atagar/Desktop/stem/stem/util/conf.py", line 604, in set listener(self, key) File "/home/atagar/Desktop/stem/stem/util/conf.py", line 175, in update new_value = config.get(key, self.config_dict[key]) File "/home/atagar/Desktop/stem/stem/util/conf.py", line 685, in get valMap = collections.OrderedDict() AttributeError: 'module' object has no attribute 'OrderedDict' Caught by pmezard on... https://trac.torproject.org/12223 This is actually something we've already dealt with elsewhere. Stem contains its own python 2.6 compatable copy of the OrderedDict module, I just forgot to use it here. --- stem/util/conf.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/stem/util/conf.py b/stem/util/conf.py index 7c1cd69..6443fba 100644 --- a/stem/util/conf.py +++ b/stem/util/conf.py @@ -157,11 +157,16 @@ Here's an expanation of what happened... +- get_value - provides the value for a given key as a string """ -import collections import threading from stem.util import log +try: + # added in python 2.7 + from collections import OrderedDict +except ImportError: + from stem.util.ordereddict import OrderedDict + CONFS = {} # mapping of identifier to singleton instances of configs @@ -682,7 +687,7 @@ class Config(object): elif isinstance(default, tuple): val = tuple(val) elif isinstance(default, dict): - valMap = collections.OrderedDict() + valMap = OrderedDict() for entry in val: if '=>' in entry: entryKey, entryVal = entry.split('=>', 1)

1 0

[translation/abouttor-homepage] Update translations for abouttor-homepage
by translation＠torproject.org 07 Jun '14

07 Jun '14

commit 150fc6a5a3d72c82867c12e7c40fd243511375e6 Author: Translation commit bot <translation(a)torproject.org> Date: Sat Jun 7 09:45:43 2014 +0000 Update translations for abouttor-homepage --- zh_HK/aboutTor.dtd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zh_HK/aboutTor.dtd b/zh_HK/aboutTor.dtd index 6b79353..9836fce 100644 --- a/zh_HK/aboutTor.dtd +++ b/zh_HK/aboutTor.dtd @@ -21,7 +21,7 @@ <!ENTITY aboutTor.failure3Link "help(a)rt.torproject.org"> <!ENTITY aboutTor.failure3suffix.label "."> -<!ENTITY aboutTor.search.label "尋找"> +<!ENTITY aboutTor.search.label "搜尋"> <!ENTITY aboutTor.searchSPPost.link "https://startpage.com/rth/search"> <!ENTITY aboutTor.searchDDGPost.link "https://duckduckgo.com/html/">

1 0