commit 4d84fe437a5fe91268ca5251e3914fb500739ea7 Merge: 73945537 56a5df67 Author: Arturo Filastò arturo@filasto.net Date: Mon Mar 13 12:04:11 2017 +0000

Merge branch 'release/v2.2.0-rc.2'

* release/v2.2.0-rc.2: Update manpages Add ooniprobe-wui version in changelog Update changelog Update to ooniprobe-wui 2.2.0-rc.4 Update to ooni-wui 2.2.0-rc.2 log.py: make rotated logfiles sortable (#734) Bump version number Update web UI to v2.2.0-rc.1 Fix bug in deleting of old resources

ChangeLog.rst | 17 +++++++ Makefile | 2 +- data/oonideckgen.1 | 2 +- data/ooniprobe-agent.1 | 2 +- data/ooniprobe.1 | 2 +- data/oonireport.1 | 2 +- data/ooniresources.1 | 2 +- ooni/__init__.py | 2 +- ooni/resources.py | 3 +- .../client/0.measurements.f49ed7ff9a0dfe68c1d1.js | 32 +++++++++++++ .../client/0.measurements.fa9ec1667736cfff6778.js | 32 ------------- ...7c3d.js => 1.dashboard.4c254cde5bb0ec3a6b60.js} | 28 +++++------ .../web/client/3.onboard.4fd0ff3c1fac3fdbeb3a.js | 2 - .../web/client/3.onboard.653b8df1e69cad6103c8.js | 2 + ...393cf.js => 4.settings.1985b978c86c68b9e586.js} | 2 +- ooni/ui/web/client/5.logs.44b85b00e5b784eee34e.js | 1 + ooni/ui/web/client/5.logs.6efdbb2fee54785b6fbc.js | 1 - ...ss => app.71d64caed8bc48459c74bf6143219cea.css} | 2 +- ooni/ui/web/client/app.795a87eeed96c2f83696.js | 54 ++++++++++++++++++++++ ooni/ui/web/client/app.dea68a5d29850155e01f.js | 50 -------------------- ooni/ui/web/client/index.html | 2 +- ooni/ui/web/client/vendor.5d69a6b6a64e3b56f52f.js | 3 ++ ooni/ui/web/client/vendor.fe472daeed43d1e98474.js | 3 -- ooni/utils/log.py | 14 +++++- 24 files changed, 148 insertions(+), 114 deletions(-)