commit b3800040cf3c34f9456541ba3854359820811bbf Author: Arturo Filastò <arturo@filasto.net> Date: Fri Jun 24 16:29:48 2016 +0200 Use the testing https and cloudfronted bouncer * Bump version number to 1.6.0rc1 --- ooni/__init__.py | 2 +- ooni/constants.py | 6 ++++-- requirements.txt | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ooni/__init__.py b/ooni/__init__.py index 6f6e78f..314534e 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,7 +1,7 @@ # -*- encoding: utf-8 -*- __author__ = "Open Observatory of Network Interference" -__version__ = "1.5.2.dev1" +__version__ = "1.6.0rc1" # This is the version number of resources to be downloaded # when a release is made it should be aligned to __version__ __resources_version__ = "1.5.1" diff --git a/ooni/constants.py b/ooni/constants.py index 881a932..8752bab 100644 --- a/ooni/constants.py +++ b/ooni/constants.py @@ -1,7 +1,9 @@ CANONICAL_BOUNCER_ONION = 'httpo://nkvphnp3p6agi5qq.onion' -CANONICAL_BOUNCER_HTTPS = 'https://bouncer.ooni.io' +# XXX Change these two to the production ones once the release is made. +# CANONICAL_BOUNCER_HTTPS = 'https://bouncer.ooni.io' +CANONICAL_BOUNCER_HTTPS = 'https://bouncer.test.ooni.io' CANONICAL_BOUNCER_CLOUDFRONT = ( - 'https://XXXX.cloudfront.net/', + 'https://d47sqwfs8741k.cloudfront.net/', 'a0.awsstatic.com' ) diff --git a/requirements.txt b/requirements.txt index dc184c9..410566e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -16,3 +16,4 @@ pypcap>=1.1 service-identity pydumbnet zope.interface +certifi