[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit df0214e8ced0be1ab6bf965e1385cbe428ff1e8d
Merge: 7eae5c1 5e86276
Author: Arturo Filastò 
Date:   Fri Jul 29 13:30:01 2016 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Add backend to required options to show error when it's not provided

 ooni/nettests/manipulation/traceroute.py |  5 +++--
 ooni/templates/scapyt.py | 10 +-
 2 files changed, 8 insertions(+), 7 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 2adc991557e39797821e5dd0f66a01ab7ccc2835
Merge: b4f14c0 a9d48f3
Author: Arturo Filastò 
Date:   Fri Feb 5 17:09:27 2016 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Fix: Typo correction
  Consistency fix: lowercase ooni backend/probe words
  Fix typos in Readme.md

 README.rst   |  6 +++---
 docs/source/writing_test_helpers.rst | 26 +-
 2 files changed, 16 insertions(+), 16 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 4d2804d5ff5beba979e495e07770d09af4139313
Merge: f2e717b ca3f990
Author: Arturo 
Date:   Fri Nov 20 13:50:58 2015 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe: (67 commits)
  Downgrading Twisted version is not needed
  Remove duplicate package
  Remove unneeded space
  Add IRC travis build notifications
  Add all supported twisted version, revise build dependencies
  Skip failing tests
  Proper fix for issue reported by @anadahz in #401
  psiphon: fix bug that psiphon hangs ooniprobe -ng
  Remove script to install psiphon
  psiphon.py: prepare for merge with master
  Minor improvements commented on 
https://github.com/TheTorProject/ooni-probe/pull/410
  psiphon: use the python provided by sys.executable
  change the way HTTP request errors are handled
  add psiphon_install.sh, code should be improved
  initial psiphon test. Failure cases doesn't fail propertly
  Properly add BTC address
  Update README.rst
  Update README.rst
  deal with existing, but empty, reporting.yml
  Fix misleading error message
  ...

 .travis.yml|   23 +-
 HACKING|2 +-
 README.rst |   17 +-
 Vagrantfile|2 +-
 bin/ooniprobe-dev  |8 +-
 bin/oonireport |2 +-
 data/ooniprobe.1   |2 +-
 docs/source/index.rst  |2 +-
 docs/source/tests/bridge_reachability.rst  |  129 +++
 docs/source/tests/meek_fronted_requests.rst|  176 ++
 ooni/errors.py |8 +-
 ooni/geoip.py  |2 +-
 ooni/nettests/blocking/meek_fronted_requests.py|2 +-
 .../experimental/bridge_reachability/echo.py   |2 +-
 ooni/nettests/manipulation/dns_spoof.py|2 +-
 ooni/nettests/scanning/http_url_list.py|2 +-
 ooni/nettests/third_party/psiphon.py   |  134 
 ooni/reporter.py   |4 +-
 ooni/templates/process.py  |   23 +-
 ooni/tests/test_oonicli.py |4 +
 ooni/tests/test_settings.py|4 +-
 ooni/utils/hacks.py|   27 --
 ooni/utils/trueheaders.py  |   24 +-
 ooni/utils/txscapy.py  |2 +-
 requirements.txt   |2 +-
 scripts/install.sh |  352 
 setup.py   |2 +-
 var/old_notes.txt  |2 +-
 var/proxooni-spec.txt  |2 +-
 29 files changed, 897 insertions(+), 66 deletions(-)




___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 4e83a9c1345cb9b594156d901de489932037809c
Merge: 17e388a f4ba7f1
Author: Arturo Filastò a...@fuffa.org
Date:   Tue Jan 20 11:27:48 2015 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Point the http header field manipulation test to a working backend
  Add support for Linux Mint
  Add install package libdumbnet-dev
  Add install of pyasn1 and pyasn1-modules to setup-dependencies script
  Remove unused reports_directory
  Skip calculating the version of the geoip files that are not found
  Ignore settings.ini
  Re-add manpages to manifest
  Use the new function for determining the geoip data files path
  Add to requirements.txt previously missing requirements
  Restructure directories where ooni software writes/reads from

 .gitignore   |2 +
 MANIFEST.in  |4 +
 data/ooniprobe.conf.sample   |2 -
 ooni/deckgen/cli.py  |4 +-
 ooni/deckgen/processors/citizenlab_test_lists.py |   16 ++--
 ooni/deckgen/processors/namebench_dns_servers.py |8 +-
 ooni/geoip.py|   14 ++--
 ooni/resources/__init__.py   |   24 --
 ooni/resources/update.py |5 +-
 ooni/settings.py |   91 +++---
 ooni/tests/test_oonicli.py   |2 +-
 requirements.txt |4 +
 setup-dependencies.sh|   11 ++-
 setup.py |   25 +-
 14 files changed, 141 insertions(+), 71 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 4c45d6d5bb1608b740ffc39af421ca8891d6767d
Merge: 292b7f2 fe07c4a
Author: Arturo Filastò a...@fuffa.org
Date:   Mon Sep 29 20:17:46 2014 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Override skipTest so that it does not produce an error inside of twisted 
12.2
  Polyfill the connectProtocol to fix compatibility with Twisted 12.2
  Add tests to verify if ooniprobe will work with the various versions of 
Twisted we are supposed to support.

Conflicts:
ooni/tests/bases.py

 .travis.yml |8 ++--
 ooni/settings.py|4 ++--
 ooni/tests/bases.py |3 +++
 ooni/utils/net.py   |   10 ++
 4 files changed, 21 insertions(+), 4 deletions(-)

diff --cc ooni/tests/bases.py
index 5f46515,73bf319..5d177fa
--- a/ooni/tests/bases.py
+++ b/ooni/tests/bases.py
@@@ -7,6 -7,8 +7,9 @@@ class ConfigTestCase(unittest.TestCase)
  def setUp(self):
  config.initialize_ooni_home(ooni_home)
  
+ def skipTest(self, reason):
+ raise unittest.SkipTest(reason)
+ 
  def tearDown(self):
 +config.set_paths()
  config.read_config_file()

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 2764cc2bca9fc60f978b3361ab2e8de372bc5af6
Merge: 852d8e5 da6ac0f
Author: Arturo Filastò a...@fuffa.org
Date:   Wed May 28 00:10:46 2014 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Implementation of the v0.3 spec

 ooni/nettests/manipulation/captiveportal.py |   42 +++
 1 file changed, 30 insertions(+), 12 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 0e3e52c68f5fa6ac6926f2eb5e6eec4351711beb
Merge: c822750 41ea9d7
Author: Arturo Filastò a...@fuffa.org
Date:   Fri May 9 22:44:17 2014 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Update Readme to point to correct file location.
  state null check
  Refactorings
  removed unnecessary imports
  Store tor exit router's ip and name with every request

 README.md   |2 +-
 ooni/templates/httpt.py |   42 +-
 2 files changed, 30 insertions(+), 14 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 2bf70e5a7485074c03e451c73a755fdb3eb22f94
Merge: 058dab4 d553127
Author: Arturo Filastò a...@fuffa.org
Date:   Mon Mar 24 16:00:33 2014 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Add required package libpcap0.8-dev
  Fix links in Documentation.

 docs/source/index.rst|8 
 docs/source/tests/dnsconsistency.rst |4 ++--
 docs/source/tests/dnsspoof.rst   |4 ++--
 docs/source/tests/http_header_field_manipulation.rst |4 ++--
 docs/source/tests/http_host.rst  |4 ++--
 docs/source/tests/http_invalid_request_line.rst  |4 ++--
 docs/source/tests/http_requests.rst  |2 +-
 docs/source/tests/tcpconnect.rst |2 +-
 docs/source/tests/traceroute.rst |2 +-
 setup-dependencies.sh|2 +-
 10 files changed, 18 insertions(+), 18 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 30e47444a861d2a74002a7e9121d9f7b5e88f4db
Merge: 58aab66 bb44733
Author: Arturo Filastò a...@fuffa.org
Date:   Fri Mar 7 13:31:33 2014 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Fix bug that leads to not showing the help if an option is not present.

 ooni/deck.py|   15 +--
 ooni/nettest.py |5 -
 2 files changed, 13 insertions(+), 7 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 0c702b6f957992d2dbe0be8356b80c3efc2e129d
Merge: 0daffad de4a8ea
Author: Arturo Filastò a...@fuffa.org
Date:   Thu Feb 20 12:08:50 2014 +

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Minor fixes to comments
  DNS-host-resolution-for-tls_handshake
  Bug-Fixes-for-tls_handshake

 ooni/nettests/experimental/tls_handshake.py |   36 ---
 1 file changed, 32 insertions(+), 4 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 1617e63a62fefbe5bd341d1be3d88cbe35b3621e
Merge: 6bdf24c 84ebfb6
Author: Arturo Filastò a...@fuffa.org
Date:   Tue Jan 14 15:49:05 2014 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Update README.md

 README.md |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 80ea75a906c2d6cefa88ca3b1b4e7e2cd5a9cc52
Merge: 79ad398 51c92f2
Author: Arturo Filastò a...@fuffa.org
Date:   Mon Jan 13 13:51:11 2014 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Update README.md

 README.md |9 +
 1 file changed, 9 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe into setup-deps

[art]

commit 3902a082746d9e298900f310ed48c61110f9e765
Merge: 35e7ded e0cb2ec
Author: David Stainton dstainton...@gmail.com
Date:   Mon Jan 13 21:30:33 2014 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe into setup-deps

 README.md |6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit e24a36b3faf4bd3f80ddc7f86042b6ccfb6479a0
Merge: 1937d56 0c4f767
Author: Arturo Filastò a...@fuffa.org
Date:   Sun Jan 12 15:43:18 2014 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Properly format the copyright file.
  Add empty setup.cfg to make debuild happy.
  Add logo to README.

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 39fc5b114969cc9f76ac56f287f3310d964714cc
Merge: 77cfa98 4e1c1ca
Author: Arturo Filastò a...@fuffa.org
Date:   Mon Nov 4 09:53:59 2013 +0100

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Add GeoIP city data to report

 ooni/nettest.py |1 +
 1 file changed, 1 insertion(+)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 296b7046d0c9da9c12774e1341dd7b9147f82605
Merge: d4d8b0b 2d94c90
Author: Arturo Filastò a...@fuffa.org
Date:   Thu Aug 15 19:26:32 2013 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Add disclaimer
  fixing rights
  back to upstream master
  nettests dir changed
  using precise-capable setup-dependencies from 
https://github.com/TheTorProject/ooni-probe/pull/54
  Add obfsproxy_binary option to sample config
  added precise and squeeze support to setup-dependencies.sh

 README.md  |9 -
 data/ooniprobe.conf.sample |1 +
 inputs/README  |   12 ++--
 setup-dependencies.sh  |   30 ++
 4 files changed, 33 insertions(+), 19 deletions(-)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 317d4a700bc058c0117fd58abce78e1ac7d0086d
Merge: 5338414 e2e8559
Author: Arturo Filastò a...@fuffa.org
Date:   Mon Jun 17 13:03:27 2013 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Update install

 README.md |   16 
 1 file changed, 16 insertions(+)



___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit f50aeda99bd906baad5ed111d7712ed410ed2235
Merge: 87c8f7b a2a563e
Author: Arturo Filastò a...@fuffa.org
Date:   Wed May 8 16:53:06 2013 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe:
  Add extra commands to step 1

 README.md |2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits

[tor-commits] [ooni-probe/master] Merge branch 'master' of github.com:TheTorProject/ooni-probe

[art]

commit 865ec32d230e18321df3ab006b8eb5fff747f9e0
Merge: df06507 4fdbd62
Author: Arturo Filastò a...@fuffa.org
Date:   Tue Apr 30 15:01:06 2013 +0200

Merge branch 'master' of github.com:TheTorProject/ooni-probe

* 'master' of github.com:TheTorProject/ooni-probe: (61 commits)
  Fix tls_handshake input processing
  Fix import conflict
  Set self.input to self.host if no inputFile, and update several log 
messages.
  Reformat docstrings for several HandshakeTest functions to Sphinx format.
  Rename HandshakeTest.test_tlsv1_handshake() to 
HandshakeTest.test_handshake().
  Cleanup docstrings for getX509Name() and getPublicKey() functions.
  Add Sphinx docstring for getPeerCert() function.
  Move to call IPAddress explicitly from ipaddr.IPAdress.
  Add self.host to the inputProcessor().
  If no ciphersuite list is provided, explain that we're using firefox's.
  Fix bug where conflicting SSL context choices was not explained to the 
user.
  Fix #8440, set the self.host attribute when given the --host option.
  Create a host attribute for storing the --host option, and set 
self.ciphers.
  Make 'context' be a class-level attribute and give it a Sphinx :attr: 
docstring.
  Bump the version number on HandshakeTest, and rename the usageOptions 
attribute.
  Rename TLSHandshakeTest to HandshakeTest, since it's not only TLS.
  Remove UsageOptions to HandshakeOptions, and make arg help strings more 
informative.
  Fix HostUnreachable docstring to have proper Sphinx formatting.
  Add dictionary of pre-defined error messages to SSLContextError.
  Update docstring for SSLContextError.
  ...

 .gitignore |2 +
 nettests/experimental/tls_handshake.py |  794 
 ooni/utils/txscapy.py  |1 +
 3 files changed, 797 insertions(+), 0 deletions(-)

___
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits