[tor-commits] [oonib/master] Merge branch 'feature/https_endpoint' of github.com:TheTorProject/ooni-backend into feature/https_endpoint

commit 4141c6a1485a32a7c0e43161201c77150b665a3c Merge: dda3f4d 35ccea7 Author: Arturo Filastò arturo@filasto.net Date: Fri May 13 12:52:28 2016 +0200

Merge branch 'feature/https_endpoint' of github.com:TheTorProject/ooni-backend into feature/https_endpoint

* 'feature/https_endpoint' of github.com:TheTorProject/ooni-backend: only assume HS endpoint when tor_hidden_service: true explain + bail out when inconsistent config

oonib/oonibackend.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)