From ae3a060b4436b4e219533f9073706cdda6a8be5c Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Thu, 18 Jun 2015 20:30:05 +0800
Subject: [PATCH] update

---
 tor/README.md          | 39 ++++++++++++++++++++++++---------------
 tor/docker-compose.yml |  3 ---
 tor/torrc              | 10 +++-------
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/tor/README.md b/tor/README.md
index 369cf52..be712d5 100644
--- a/tor/README.md
+++ b/tor/README.md
@@ -17,38 +17,47 @@ tor:
   image: vimagick/tor
   ports:
     - "9001:9001"
-    - "9030:9030"
-    - "9050:9050"
-    - "9051:9051"
   volumes:
     - ./torrc:/etc/tor/torrc
   restart: always
 ```
 
-## torrc
+## torrc (server)
 
 ```
-Log notice stdout
-RunAsDaemon 0
-SocksPort 0.0.0.0:9050
+SocksPort 0
 ORPort 9001
-DirPort 9030
 BridgeRelay 1
-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy
-ExtORPort auto
 Exitpolicy reject *:*
-ContactInfo noreply@datageek.info
 Nickname datageek
+ContactInfo noreply@datageek.info
+ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
 ```
 
-## up and running
+## torrc (client)
+
+```
+#Socks5Proxy 127.0.0.1:1080
+UseBridges 1
+Bridge obfs3 1.2.3.4:9001 F24BF4DE74649E205A8A3621C84F97FF623B2083
+```
+
+> Please connect via `Socks5Proxy` if you're blocked!
+
+## server
 
 ```
 $ docker-compose up -d
+$ docker-compose logs
+```
+
+## client
+
+```
+$ tor -f /etc/tor/torrc
 $ curl -x socks5h://127.0.0.1:9050 ifconfig.me
 ```
 
-## todo
-
-- support `obfs4proxy`
+## references
 
+- https://www.torproject.org/projects/obfsproxy-debian-instructions.html.en
diff --git a/tor/docker-compose.yml b/tor/docker-compose.yml
index 4f46ae5..31d02e6 100644
--- a/tor/docker-compose.yml
+++ b/tor/docker-compose.yml
@@ -2,9 +2,6 @@ tor:
   image: vimagick/tor
   ports:
     - "9001:9001"
-    - "9030:9030"
-    - "9050:9050"
-    - "9051:9051"
   volumes:
     - ./torrc:/etc/tor/torrc
   restart: always
diff --git a/tor/torrc b/tor/torrc
index f3738a0..6138a21 100644
--- a/tor/torrc
+++ b/tor/torrc
@@ -1,11 +1,7 @@
-Log notice stdout
-RunAsDaemon 0
-SocksPort 0.0.0.0:9050
+SocksPort 0
 ORPort 9001
-DirPort 9030
 BridgeRelay 1
-ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy
-ExtORPort auto
 Exitpolicy reject *:*
-ContactInfo noreply@datageek.info
 Nickname datageek
+ContactInfo noreply@datageek.info
+ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed