tor-commits November 2015

tor-commits@lists.torproject.org

20 participants
856 discussions

[ooni-probe/master] Merge pull request #425 from TheTorProject/feature/psiphon-dev-sbs-rebased
by art＠torproject.org 20 Nov '15

20 Nov '15

commit c853b7bfaccaae9a4122f5241a7e23dea26c1b53 Merge: 8449d67 1172083 Author: Simone Basso <bassosimone(a)gmail.com> Date: Sun Nov 15 17:18:13 2015 +0100 Merge pull request #425 from TheTorProject/feature/psiphon-dev-sbs-rebased Add third_party test for psiphon ooni/errors.py | 8 +- ooni/nettests/third_party/psiphon.py | 134 ++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 2 deletions(-)

1 0

[ooni-probe/master] Merge pull request #427 from TheTorProject/fix/travis
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 703cc52947fd1c35d57360c6301a1c0466ee60f7 Merge: 6a44287 f7bcdeb Author: Simone Basso <bassosimone(a)gmail.com> Date: Tue Nov 17 21:03:29 2015 +0100 Merge pull request #427 from TheTorProject/fix/travis Fix/travis .travis.yml | 23 ++++++++++++++++++++--- ooni/tests/test_oonicli.py | 2 ++ 2 files changed, 22 insertions(+), 3 deletions(-)

1 0

[ooni-probe/master] Merge pull request #424 from TheTorProject/fix/get-diff-missing-error
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 6a442875fe2c88d2921aee6acffd44143d61fa8f Merge: c853b7b d362048 Author: anadahz <anadahz(a)users.noreply.github.com> Date: Tue Nov 17 18:01:23 2015 +0000 Merge pull request #424 from TheTorProject/fix/get-diff-missing-error Fix regression I introduced in #401 ooni/utils/trueheaders.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)

1 0

[ooni-probe/master] Merge pull request #429 from TheTorProject/fix/README
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 6fadb736110fc722a06cc6176851cca4f5b6d660 Merge: 703cc52 ab57cb5 Author: Simone Basso <bassosimone(a)gmail.com> Date: Wed Nov 18 16:26:49 2015 +0100 Merge pull request #429 from TheTorProject/fix/README Downgrading Twisted version is not needed README.rst | 6 ------ 1 file changed, 6 deletions(-)

1 0

[ooni-probe/master] Add all supported twisted version, revise build dependencies
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 867236e460c65e840afa4a7be3da6898d3319398 Author: anadahz <kojgelo(a)inbox.com> Date: Tue Nov 17 20:09:51 2015 +0100 Add all supported twisted version, revise build dependencies Include all Twisted versions >= 12.2 and latest as travis ENV tests Add required build dependencies packages Remove duplicate pip package pydnet (pydumpnet) --- .travis.yml | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 99bb48f..db639dd 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,10 +2,22 @@ language: python env: - TWISTED=Twisted==12.2 - TWISTED=Twisted==12.3 + - TWISTED=Twisted==13.0 + - TWISTED=Twisted==13.1 - TWISTED=Twisted==13.2 - TWISTED=Twisted==14.0 + - TWISTED=Twisted==14.0.1 + - TWISTED=Twisted==14.0.2 + - TWISTED=Twisted==15.0.0 + - TWISTED=Twisted==15.1.0 + - TWISTED=Twisted==15.2.0 + - TWISTED=Twisted==15.2.1 + - TWISTED=Twisted==15.3.0 + - TWISTED=Twisted==15.4.0 + - TWISTED=Twisted before_install: - - sudo apt-get install tor libpcap-dev libgeoip-dev libdumbnet-dev + - sudo apt-get install tor libpcap-dev libgeoip-dev libdumbnet-dev libffi-dev + libdumbnet-dev libssl-dev - sudo /etc/init.d/tor start python: - "2.7" @@ -13,7 +25,6 @@ python: # the first is for testing pip and the second for setuptools install: - pip install $TWISTED pyOpenSSL coveralls - - pip install https://github.com/hellais/pydnet/archive/master.zip - pip install pyrex-real - pip install -r requirements.txt - pip install -r requirements-dev.txt

1 0

[ooni-probe/master] Remove unneeded space
by art＠torproject.org 20 Nov '15

20 Nov '15

commit f7bcdebfe6cefa3dd3e454466e37334e7981852f Author: anadahz <kojgelo(a)inbox.com> Date: Tue Nov 17 20:17:31 2015 +0100 Remove unneeded space --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index f265676..926468a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -32,7 +32,7 @@ install: # command to run tests, e.g. python setup.py test script: - sudo $(which coverage) run $(which trial) ooni -after_success: +after_success: - coveralls notifications: irc:

1 0

[ooni-probe/master] Add IRC travis build notifications
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 7eb2022821315a94baed956bf2d5e036b9537381 Author: anadahz <kojgelo(a)inbox.com> Date: Tue Nov 17 20:14:03 2015 +0100 Add IRC travis build notifications IRC build notifications will be send to channel #ooni (OFTC) triggered on build success change and always on build failure --- .travis.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.travis.yml b/.travis.yml index db639dd..f265676 100644 --- a/.travis.yml +++ b/.travis.yml @@ -34,3 +34,9 @@ script: - sudo $(which coverage) run $(which trial) ooni after_success: - coveralls +notifications: + irc: + channels: + - "irc.oftc.net#ooni" + on_success: change + on_failure: always

1 0

[ooni-probe/master] Remove duplicate package
by art＠torproject.org 20 Nov '15

20 Nov '15

commit 528f965b86da50aa97f96acb2f547e351060ee70 Author: anadahz <kojgelo(a)inbox.com> Date: Tue Nov 17 21:44:59 2015 +0100 Remove duplicate package Remove duplicate apt package libdumbnet-dev As spotted by @bassosimone --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 926468a..fb6a033 100644 --- a/.travis.yml +++ b/.travis.yml @@ -17,7 +17,7 @@ env: - TWISTED=Twisted before_install: - sudo apt-get install tor libpcap-dev libgeoip-dev libdumbnet-dev libffi-dev - libdumbnet-dev libssl-dev + libssl-dev - sudo /etc/init.d/tor start python: - "2.7"

1 0

[ooni-probe/master] Proper fix for issue reported by @anadahz in #401
by art＠torproject.org 20 Nov '15

20 Nov '15

commit d362048243be4990d43d4fda211d29bb053dcdae Author: Simone Basso <bassosimone(a)gmail.com> Date: Tue Nov 17 15:44:03 2015 +0100 Proper fix for issue reported by @anadahz in #401 --- ooni/utils/trueheaders.py | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/ooni/utils/trueheaders.py b/ooni/utils/trueheaders.py index ac73970..149b440 100644 --- a/ooni/utils/trueheaders.py +++ b/ooni/utils/trueheaders.py @@ -20,6 +20,9 @@ SOCKS5ClientFactory.noisy = False from ooni.utils import log +import twisted +from twisted.python.versions import Version + class TrueHeaders(http_headers.Headers): def __init__(self, rawHeaders=None): @@ -160,7 +163,19 @@ class TrueHeadersAgent(client.Agent): self._pool = HTTPConnectionPool(reactor, False) +_twisted_15_0 = Version('twisted', 15, 0, 0) + + class TrueHeadersSOCKS5Agent(SOCKS5Agent): def __init__(self, *args, **kw): super(TrueHeadersSOCKS5Agent, self).__init__(*args, **kw) - self._pool = HTTPConnectionPool(reactor, False) + pool = HTTPConnectionPool(reactor, False) + # + # With Twisted > 15.0 txsocksx wraps the twisted agent using a + # wrapper class, hence we must set the _pool attribute in the + # inner class rather than into its external wrapper. + # + if twisted.version >= _twisted_15_0: + self._wrappedAgent._pool = pool + else: + self._pool = pool

1 0

[ooni-probe/master] Downgrading Twisted version is not needed
by art＠torproject.org 20 Nov '15

20 Nov '15

commit ab57cb58cacbbc9f046fa323fa256cf9fa1aaf32 Author: anadahz <kojgelo(a)inbox.com> Date: Tue Nov 17 21:50:08 2015 +0100 Downgrading Twisted version is not needed Thanks to @bassosimone --- README.rst | 6 ------ 1 file changed, 6 deletions(-) diff --git a/README.rst b/README.rst index 7c624dc..bf52114 100644 --- a/README.rst +++ b/README.rst @@ -60,12 +60,6 @@ On unix systems:: sudo pip install ooniprobe -**BUG** Note: Twisted version needs to be >=12.2.0 and <=14.0.0 -unistall/downgrage Twisted:: - - sudo pip uninstall Twisted - sudo pip install 'Twisted>=12.2.0,<=14.0.0' - To install it from the current master run:: sudo pip install https://github.com/TheTorProject/ooni-probe/archive/master.zip

1 0

← Newer
1
...
22
23
24
25
26
27
28
...
86
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

tor-commits November 2015