[tor-commits] [ooni-probe/master] Add config option for enabling tor2web mode on oonib

[art at torproject.org]

commit 93467bb98dc20ff08dceb65c03e1f85275888b85
Author: Arturo Filastò <art at fuffa.org>
Date:   Fri Dec 7 02:03:37 2012 +0100

    Add config option for enabling tor2web mode on oonib
---
 oonib/config.py |    6 ++++++
 oonib/runner.py |    2 ++
 2 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/oonib/config.py b/oonib/config.py
index cdee45a..8598e00 100644
--- a/oonib/config.py
+++ b/oonib/config.py
@@ -24,6 +24,12 @@ main.db_threadpool_size = 10
 #main.tor_binary = '/usr/sbin/tor'
 main.tor_binary = '/usr/local/bin/tor'
 
+# This requires compiling Tor with tor2web mode enabled
+# BEWARE!! THIS PROVIDES NO ANONYMITY!!
+# ONLY DO IT IF YOU KNOW WHAT YOU ARE DOING!!
+# HOSTING A COLLECTOR WITH TOR2WEB MODE GIVES YOU NO ANONYMITY!!
+main.tor2webmode = True
+
 helpers = Storage()
 
 helpers.http_return_request = Storage()
diff --git a/oonib/runner.py b/oonib/runner.py
index b13c8b2..44cfe9c 100644
--- a/oonib/runner.py
+++ b/oonib/runner.py
@@ -40,6 +40,8 @@ def startTor():
 
     torconfig = txtorcon.TorConfig()
     torconfig.SocksPort = 9055
+    if config.main.tor2webmode:
+        torconfig.Tor2webMode = True
     torconfig.save()
     d = txtorcon.launch_tor(torconfig, reactor,
             tor_binary=config.main.tor_binary,