Merge pull request #382 from Psiphon-Labs/master

Merge master into staging-client

.gitignore

@@ -5,6 +5,7 @@ controller_test.config
 psiphon.db*
 psiphon.boltdb
 remote_server_list
+psiphon-embedded-server-entries.txt
 
 # Exclude compiled tunnel core binaries
 ConsoleClient/ConsoleClient

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 go:
-- 1.8
+- 1.8.3
 addons:
   apt_packages:
     - libx11-dev

ConsoleClient/Dockerfile

@@ -22,7 +22,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Go.
-ENV GOVERSION=go1.8 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.8.3 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
    && tar -C /usr/local -xzf /tmp/go.tar.gz \

ConsoleClient/make.bash

@@ -12,7 +12,7 @@ EXE_BASENAME="psiphon-tunnel-core"
 # The "OPENSSL" tag enables support of OpenSSL for use by IndistinguishableTLS.
 # This needs to be outside of prepare_build because it's used by go-get.
 
-PRIVATE_PLUGINS_TAG="PRIVATE_PLUGINS"
+PRIVATE_PLUGINS_TAG=""
 BUILD_TAGS="${PRIVATE_PLUGINS_TAG}"
 WINDOWS_BUILD_TAGS="OPENSSL ${BUILD_TAGS}"
 LINUX_BUILD_TAGS="${BUILD_TAGS}"

MobileLibrary/Android/Dockerfile

@@ -19,7 +19,7 @@ RUN apt-get update -y && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/*
 
 # Install Go.
-ENV GOVERSION=go1.8 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
+ENV GOVERSION=go1.8.3 GOROOT=/usr/local/go GOPATH=/go PATH=$PATH:/usr/local/go/bin:/go/bin CGO_ENABLED=1
 
 RUN curl -L https://storage.googleapis.com/golang/$GOVERSION.linux-amd64.tar.gz -o /tmp/go.tar.gz \
   && tar -C /usr/local -xzf /tmp/go.tar.gz \

MobileLibrary/Android/make.bash

@@ -9,7 +9,7 @@ fi
 
 # The "OPENSSL" tag enables support of OpenSSL for use by IndistinguishableTLS.
 
-PRIVATE_PLUGINS_TAG="PRIVATE_PLUGINS"
+PRIVATE_PLUGINS_TAG=""
 BUILD_TAGS="OPENSSL ${PRIVATE_PLUGINS_TAG}"
 
 # Don't use '-u' to force updates because the docker builds always pull

MobileLibrary/iOS/.gitignore

@@ -5,6 +5,7 @@ Psi.framework
 PsiphonTunnel.framework
 rootCAs.txt
 psiphon-config.json
+PsiphonTunnel/build-git-commit.txt
 
 #
 # Xcode