Merge branch '1.3'

2015-12-02 15:34:07 +00:00
commit 29f3d711c6
@@ -1447,7 +1447,7 @@ proxy_args() {
          PROXY_HOST="unix:///var/run/weave/weave.sock"
          ;;
        *)
-          PROXY_HOST="tcp://0.0.0.0:12375"
+          PROXY_HOST="tcp://0.0.0.0:$PROXY_PORT"
          ;;
      esac
      host_arg "$PROXY_HOST"