commit 4716696515528665248fbbcacb7e5ab8b4c4b918 Author: Nathan Freitas <nathan@freitas.net> Date: Wed Jun 11 20:23:38 2014 -0400 make transport settings dynamic (remove from torrc) --- res/raw/torrc | 9 +-------- res/raw/torrcdiag | 18 +++--------------- 2 files changed, 4 insertions(+), 23 deletions(-) diff --git a/res/raw/torrc b/res/raw/torrc index aade84c..1ebabf7 100644 --- a/res/raw/torrc +++ b/res/raw/torrc @@ -1,11 +1,4 @@ Log notice stdout ControlPortWriteToFile /data/data/org.torproject.android/app_bin/control.txt ControlPort auto -CookieAuthentication 1 -TransPort 9040 -TransListenAddress 127.0.0.1 -DNSPort 5400 -DNSListenAddress 127.0.0.1 -AvoidDiskWrites 1 -VirtualAddrNetwork 10.192.0.0/10 -AutomapHostsOnResolve 1 \ No newline at end of file +CookieAuthentication 1 \ No newline at end of file diff --git a/res/raw/torrcdiag b/res/raw/torrcdiag index 2edd200..df37970 100644 --- a/res/raw/torrcdiag +++ b/res/raw/torrcdiag @@ -1,16 +1,4 @@ -SocksPort 9050 -SOCKSListenAddress 127.0.0.1 -SafeSocks 0 -TestSocks 1 -WarnUnsafeSocks 1 -Log info stdout -ControlListenAddress 127.0.0.1 -ControlPort 9051 +Log debug stdout +ControlPortWriteToFile /data/data/org.torproject.android/app_bin/control.txt +ControlPort auto CookieAuthentication 1 -TransPort 9040 -TransListenAddress 127.0.0.1 -DNSPort 5400 -DNSListenAddress 127.0.0.1 -AvoidDiskWrites 1 -VirtualAddrNetwork 10.192.0.0/10 -AutomapHostsOnResolve 1 \ No newline at end of file