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

[ooni-probe/master] Txscapy is now in pypi, no need to have it mirrored on tpo
by isis＠torproject.org 11 Mar '13

11 Mar '13

commit 160b10d8bfcba159524b53ce292d8ac3d9d0e867 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 15:58:29 2013 +0100 Txscapy is now in pypi, no need to have it mirrored on tpo (cherry picked from commit e74ea0cbd7816bda547dced875523253ca6d312a) Conflicts: requirements.txt

1 0

[ooni-probe/master] Merge remote-tracking branch 'gh-common/master'
by isis＠torproject.org 11 Mar '13

11 Mar '13

commit 946a321a0a120697ca5fb42f4c6972361fa2afaa Merge: 4bd8e05 5ca95ac Author: Isis Lovecruft <isis(a)torproject.org> Date: Mon Mar 11 19:04:56 2013 +0000 Merge remote-tracking branch 'gh-common/master' requirements.txt | 5 +--- setup.py | 55 ++++++++++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 32 deletions(-)

1 0

[ooni-probe/master] Update setup.py script and test that it works.
by isis＠torproject.org 11 Mar '13

11 Mar '13

commit b96b8a60f92fb6b64b028b14484286a4a5829717 Author: Arturo Filastò <art(a)fuffa.org> Date: Wed Feb 27 15:59:01 2013 +0100 Update setup.py script and test that it works. (cherry picked from commit 7a55afa0399d2338f6ac5b8e2232e3645d694c06) --- setup.py | 27 +++++++++++++++++++++++---- 1 files changed, 23 insertions(+), 4 deletions(-) diff --git a/setup.py b/setup.py index 3844036..317d3b5 100644 --- a/setup.py +++ b/setup.py @@ -1,17 +1,36 @@ #!/usr/bin/env python #-*- coding: utf-8 -*- -from distutils.core import setup +from setuptools import setup + +install_requires = [ + 'txsocksx>=0.0.2', + 'scapy>=2.2.0', + 'dnspython>=1.10.0', + 'parsley>1.0', + 'pypcap>=1.1.1' +] + +dependency_links = [ + 'https://people.torproject.org/~ioerror/src/mirrors/ooniprobe', + 'https://github.com/hellais/pypcap/archive/v1.1.1.tar.gz#egg=pypcap-1.1.1' +] + +with open('requirements.txt') as f: + for line in f: + if line.startswith("#") or line.startswith('http'): + continue + install_requires.append(line) setup( name="ooni-probe", - version="0.0.8", + version="0.0.10", author="Arturo Filastò", author_email = "art(a)torproject.org", url="https://ooni.torproject.org/", package_dir={'ooni': 'ooni'}, packages=['ooni', 'ooni.templates', 'ooni.utils'], scripts=["bin/ooniprobe"], - install_requires=open('requirements.txt').readlines(), - dependency_links=["https://hg.secdev.org/scapy/archive/tip.zip#egg=scapy"] + dependency_links=dependency_links, + install_requires=install_requires, )

1 0

[ooni-probe/master] Merge pull request #56 from hellais/feature/setup.py
by isis＠torproject.org 11 Mar '13

11 Mar '13

commit 5ca95ace243f8baa1f2f3203c1be605ae82686a0 Merge: 4bd8e05 b96b8a6 Author: Isis Agora Lovecruft <isis(a)torproject.org> Date: Mon Mar 11 12:04:02 2013 -0700 Merge pull request #56 from hellais/feature/setup.py Feature/setup.py requirements.txt | 5 +--- setup.py | 55 ++++++++++++++++++++++++++--------------------------- 2 files changed, 28 insertions(+), 32 deletions(-)

1 0

[torspec/master] Clarify GETINFO response formatting for #6172
by nickm＠torproject.org 11 Mar '13

11 Mar '13

commit 459b3c93b2041bca718b6ce7fdaf5cb5864f5cc3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:15:01 2013 -0400 Clarify GETINFO response formatting for #6172 --- control-spec.txt | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index d2130b6..6ad3ed2 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -270,9 +270,10 @@ empty string, Tor may reply with a reply line of the form: 250 keyword - Value may be a raw value or a quoted string. Tor will try to use - unquoted values except when the value could be misinterpreted through - not being quoted. + Value may be a raw value or a quoted string. Tor will try to use unquoted + values except when the value could be misinterpreted through not being + quoted. (Right now, Tor supports no such misinterpretable values for + configuration options.) If some of the listed keywords can't be found, Tor replies with a "552 unknown configuration keyword" message.

1 0

[torspec/master] Document MEASURE_TIMEOUT; bug 7626.
by nickm＠torproject.org 11 Mar '13

11 Mar '13

commit b00456b35d0c6ded192f6c90a49a53ccc332bcf0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 14:07:14 2013 -0400 Document MEASURE_TIMEOUT; bug 7626. --- control-spec.txt | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/control-spec.txt b/control-spec.txt index 02f4705..d2130b6 100644 --- a/control-spec.txt +++ b/control-spec.txt @@ -1297,7 +1297,7 @@ Purpose = "GENERAL" / "HS_CLIENT_INTRO" / "HS_CLIENT_REND" / "HS_SERVICE_INTRO" / "HS_SERVICE_REND" / "TESTING" / - "CONTROLLER" + "CONTROLLER" / "MEASURE_TIMEOUT" HSState = "HSCI_CONNECTING" / "HSCI_INTRO_SENT" / "HSCI_DONE" / "HSCR_CONNECTING" / "HSCR_ESTABLISHED_IDLE" / @@ -1342,6 +1342,7 @@ HS_SERVICE_REND (HS service-side rendezvous circuit) TESTING (reachability-testing circuit; carries no traffic) CONTROLLER (circuit built by a controller) + MEASURE_TIMEOUT (circuit being kept around to see how long it takes) The "HS_STATE" field is provided only for hidden-service circuits, and only in versions 0.2.3.11-alpha and later. Clients MUST accept

1 0

[tor/release-0.2.4] fold in changes entry
by arma＠torproject.org 11 Mar '13

11 Mar '13

commit fcd9248387249d68619734a73860ffaab12b021b Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Mar 11 14:03:06 2013 -0400 fold in changes entry --- ChangeLog | 2 +- changes/geoip-mar2013 | 3 --- 2 files changed, 1 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 74ac362..1c21c10 100644 --- a/ChangeLog +++ b/ChangeLog @@ -69,7 +69,7 @@ Changes in version 0.2.4.11-alpha - 2013-03-11 we could wind up in a situation where users with such backends would be distinguishable from users without. Fixes bug 8121; bugfix on 0.2.4.8-alpha. - - Update to the February 6 2013 Maxmind GeoLite Country database. + - Update to the March 6 2013 Maxmind GeoLite Country database. o Minor bugfixes (clients): - When we receive a RELAY_END cell with the reason DONE, or with no diff --git a/changes/geoip-mar2013 b/changes/geoip-mar2013 deleted file mode 100644 index e9cc398..0000000 --- a/changes/geoip-mar2013 +++ /dev/null @@ -1,3 +0,0 @@ - o Minor features: - - Update to the March 6 2013 Maxmind GeoLite Country database. -

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4
by arma＠torproject.org 11 Mar '13

11 Mar '13

commit ef4db3169344567f30fb72e3e9a66154b976d889 Merge: 0196647 c6ca199 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 13:32:16 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.3' into maint-0.2.4 changes/geoip-mar2013 | 3 + src/config/geoip |92875 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 85446 insertions(+), 7432 deletions(-)

1 0

[tor/release-0.2.4] Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3
by arma＠torproject.org 11 Mar '13

11 Mar '13

commit c6ca199888102a825f004f8613331f97525da486 Merge: 5e0ce4c 3dde6d5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Mar 11 13:32:01 2013 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' into maint-0.2.3 changes/geoip-mar2013 | 3 + src/config/geoip |92875 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 85446 insertions(+), 7432 deletions(-)

1 0

[tor/release-0.2.4] Merge branch 'maint-0.2.4' into release-0.2.4
by arma＠torproject.org 11 Mar '13

11 Mar '13

commit 790ddd6e0af1be48dc842a28c1599a6027f85b30 Merge: f0a5f91 ef4db31 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Mar 11 14:02:26 2013 -0400 Merge branch 'maint-0.2.4' into release-0.2.4 changes/geoip-mar2013 | 3 + src/config/geoip |92875 +++++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 85446 insertions(+), 7432 deletions(-)

1 0