commit 0248c55416ca9dd0491901804bfcf5f6cfe8d7e8 Author: Arturo Filastò arturo@filasto.net Date: Thu Jun 30 12:38:31 2016 +0200

Update to version 1.6.0

* Set the correct addresses for the canonical https and cloudfronted bouncer

* Update contact information --- ooni/__init__.py | 4 ++-- ooni/constants.py | 6 ++---- setup.py | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/ooni/__init__.py b/ooni/__init__.py index 314534e..fdf96e5 100644 --- a/ooni/__init__.py +++ b/ooni/__init__.py @@ -1,10 +1,10 @@ # -*- encoding: utf-8 -*-

__author__ = "Open Observatory of Network Interference" -__version__ = "1.6.0rc1" +__version__ = "1.6.0" # 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" +__resources_version__ = "1.6.0"

__all__ = [ 'common', diff --git a/ooni/constants.py b/ooni/constants.py index 8752bab..6efa52e 100644 --- a/ooni/constants.py +++ b/ooni/constants.py @@ -1,9 +1,7 @@ CANONICAL_BOUNCER_ONION = 'httpo://nkvphnp3p6agi5qq.onion' -# 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_HTTPS = 'https://bouncer.ooni.io' CANONICAL_BOUNCER_CLOUDFRONT = ( - 'https://d47sqwfs8741k.cloudfront.net/', + 'https://d3kr4emv7f56qa.cloudfront.net/', 'a0.awsstatic.com' )

diff --git a/setup.py b/setup.py index 1a8138c..ff1b6c2 100644 --- a/setup.py +++ b/setup.py @@ -336,7 +336,7 @@ setup( name="ooniprobe", version=__version__, author=__author__, - author_email="ooni-dev@lists.torproject.org", + author_email="contact@openobservatory.org", description="Network measurement tool for" "identifying traffic manipulation and blocking.", long_description=__doc__,