From 9a40659ce62a4d9271e6e6cfe6198f862ad7dc29 Mon Sep 17 00:00:00 2001
From: kev <vimagick@gmail.com>
Date: Mon, 28 Sep 2015 15:41:16 +0800
Subject: [PATCH] fix

---
 tor/Dockerfile | 6 +++---
 tor/README.md  | 8 +++++---
 tor/torrc      | 4 ++--
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/tor/Dockerfile b/tor/Dockerfile
index e5b5844..7e610d1 100644
--- a/tor/Dockerfile
+++ b/tor/Dockerfile
@@ -7,8 +7,8 @@ MAINTAINER kev <noreply@datageek.info>
 
 RUN echo 'http://dl-4.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
     && apk add -U build-base \
-                  gmp-dev \
                   git \
+                  gmp-dev \
                   go \
                   libgmpxx \
                   py-pip \
@@ -22,12 +22,12 @@ RUN echo 'http://dl-4.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositor
         && rm -rf /tmp/obfs4 \
     && apk del build-base \
                git \
-               go \
                gmp-dev \
+               go \
                python-dev \
     && rm -rf /var/cache/apk/* \
     && mkdir -p /home/tor/.tor \
-    && chown -R tor:nogroup /home/tor \
+    && chown -R tor:nogroup /home/tor
 
 COPY ./torrc /etc/tor/torrc
 
diff --git a/tor/README.md b/tor/README.md
index d9478d5..51abde4 100644
--- a/tor/README.md
+++ b/tor/README.md
@@ -25,11 +25,13 @@ tor:
   image: vimagick/tor
   ports:
     - "9001:9001"
-  volumes:
-    - ./torrc:/etc/tor/torrc
+# volumes:
+#   - ./torrc:/etc/tor/torrc
   restart: always
 ```
 
+> Uncomment `volumes` section to use customized torrc.
+
 ## torrc (server)
 
 ```
@@ -62,7 +64,7 @@ Bridge obfs4 1.2.3.4:9001 F24BF4DE74649E205A8A3621C84F97FF623B2083
 $ docker-compose up -d
 $ docker-compose logs
 $ docker exec -it tor_tor_1 tor --quiet --list-fingerprint
-datageek F24BF4DE74649E205A8A3621C84F97FF623B2083
+datageek F24B F4DE 7464 9E20 5A8A 3621 C84F 97FF 623B 2083
 ```
 
 ## client
diff --git a/tor/torrc b/tor/torrc
index 6d3f469..3585d6a 100644
--- a/tor/torrc
+++ b/tor/torrc
@@ -4,6 +4,6 @@ BridgeRelay 1
 Exitpolicy reject *:*
 Nickname datageek
 ContactInfo noreply@datageek.info
-ServerTransportPlugin fte exec /usr/bin/fteproxy --mode server --managed
+#ServerTransportPlugin fte exec /usr/bin/fteproxy --mode server --managed
 #ServerTransportPlugin obfs3 exec /usr/bin/obfsproxy managed
-#ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy
+ServerTransportPlugin obfs4 exec /usr/bin/obfs4proxy