Latest commit 6d01c08 Feb 14, 2017 @bassosimone bassosimone Merge branch 'stable' into merge-stable
Conflicts:
	.gitlab-ci.yml
	configure.ac
	doc/api/common/version.md
	doc/index.md
	include/measurement_kit/common/version.h
	include/measurement_kit/http/http.hpp
	include/measurement_kit/ooni/error.hpp
	measurement_kit.podspec