[tor-commits] [oonib/master] Merge branch 'feature/https_endpoint'

Mon May 30 13:44:55 UTC 2016

commit 612eb5a1c7a6ea1f2f83d3eb7a9f5ffb1d68c64f
Merge: 94d3452 90ca955
Author: Arturo FilastÃ² <arturo at filasto.net>
Date:   Fri May 13 13:21:28 2016 +0200

    Merge branch 'feature/https_endpoint'
    
    * feature/https_endpoint:
      Ensure bouncer_endpoints and collector_endpoints are by default empty lists
      Remove unused imports
      Fix typo in gen-ssl-key-cert script
      only assume HS endpoint when tor_hidden_service: true
      explain + bail out when inconsistent config
      Move gen-ssl-key-cert to scripts directory
      remove another print from debugging
      maintain old behaviour
      remove echo server i used for debugging
      easily swappable {TCP, TLS, onion} endpoints

 oonib.conf.example          |  13 ++++-
 oonib/onion.py              |  10 +---
 oonib/oonibackend.py        | 130 +++++++++++++++++++++++++-------------------
 scripts/gen-ssl-key-cert.sh |  13 +++++
 4 files changed, 98 insertions(+), 68 deletions(-)