sarvex · sourcery-ai · Jun 3, 2016 · Jun 3, 2016 · Jun 3, 2016 · Jun 3, 2016
diff --git a/README.md b/README.md
@@ -1,296 +1,31 @@
-# lantern [![Travis CI Status](https://travis-ci.org/getlantern/lantern.svg?branch=valencia)](https://travis-ci.org/getlantern/lantern)&nbsp;[![Coverage Status](https://coveralls.io/repos/getlantern/lantern/badge.png?branch=valencia)](https://coveralls.io/r/getlantern/lantern)&nbsp;[![ProjectTalk](http://www.projecttalk.io/images/gh_badge-3e578a9f437f841de7446bab9a49d103.svg?vsn=d)] (http://www.projecttalk.io/boards/getlantern%2Flantern?utm_campaign=gh-badge&utm_medium=badge&utm_source=github)
+## 蓝灯(Lantern)最新版本下载 版本5.8.3  Download Lantern Version 5.8.3
 
-**If you're looking for Lantern installers, you can find all of them at the following links:**
-- [Android](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta.apk)
-- [Windows XP SP 3 and above](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta.exe)
-- [OSX 10.8 and above](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta.dmg)
-- [Ubuntu 14.04 32 bit](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta-32-bit.deb)
-- [Ubuntu 14.04 64 bit](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-beta-64-bit.deb)
-- [Arch Linux](https://aur.archlinux.org/packages/lantern)
+[Windows7及以上 Windows 7+](https://gitlab.com/getlantern/lantern-binaries/raw/master/lantern-installer.exe)      [备用地址1 Alternative address1](https://s3.amazonaws.com/lantern/lantern-installer.exe)  [备用地址2 Alternative address2](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer.exe)  
 
-**If you're looking for help, please visit below user forums:**
 
-| [English](https://groups.google.com/forum/#!forum/lantern-users-en) | [中文](https://groups.google.com/forum/#!forum/lantern-users-zh) | [فارسی](https://groups.google.com/forum/#!forum/lantern-users-fa) | [français](https://groups.google.com/forum/#!forum/lantern-users-fr)
+[安卓版(4.1+) Android(4.1+)](https://gitlab.com/getlantern/lantern-binaries/raw/master/lantern-installer.apk)      [备用地址1 Alternative address1](https://s3.amazonaws.com/lantern/lantern-installer.apk)  [备用地址2 Alternative address2](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer.apk)  [Google Play](https://play.google.com/store/apps/details?id=org.getlantern.lantern) 
 
-## Building Lantern
+[iOS版本(12.1+) iOS(12.1+)](https://apps.apple.com/app/id1457872372?l=zh_cn) [iOS版安装使用教程](https://github.com/getlantern/lantern/wiki/%E8%93%9D%E7%81%AFiOS%E5%AE%89%E8%A3%85%E4%BD%BF%E7%94%A8%E6%95%99%E7%A8%8B)
 
-### Prerequisites
 
-* [Git](https://git-scm.com/downloads) - `brew install git`, `apt-get install git`, etc
-* [Go 1.6 or higher](https://golang.org/dl/).
-* [GNU Make](https://www.gnu.org/software/make/)
-* [Nodejs & NPM](https://nodejs.org/en/download/package-manager/)
-* GNU C Library (linux only) - `apt-get install libc6-dev-i386`, etc
-* [Gulp](http://gulpjs.com/) - `npm i gulp -g`
+[苹果电脑版(OS X 10.11 El Capitan及以上](https://gitlab.com/getlantern/lantern-binaries/raw/master/lantern-installer.dmg)      [备用地址1 Alternative address1](https://s3.amazonaws.com/lantern/lantern-installer.dmg)  [备用地址2 Alternative address2](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer.dmg) 
 
-To build and run Lantern desktop, just do:
 
-```sh
-git clone https://github.com/getlantern/lantern.git
-cd lantern
-make lantern
-./lantern
-```
+Ubuntu 14.04及以上 [32位系统](https://gitlab.com/getlantern/lantern-binaries/raw/master/lantern-installer-32-bit.deb)      [备用地址 Alternative address](https://s3.amazonaws.com/lantern/lantern-installer-32-bit.deb)  [64位系统](https://gitlab.com/getlantern/lantern-binaries/raw/master/lantern-installer-64-bit.deb)      [备用地址 Alternative address](https://s3.amazonaws.com/lantern/lantern-installer-64-bit.deb) 
 
-During development, you'll likely want to do a clean build like this:
+请大家收藏本页面，方便日后下载新版。
+Bookmark this page to download the latest versions in the future.
 
-```sh
-make clean-desktop lantern && ./lantern
-```
+**使用遇到问题，请阅读[蓝灯常见问题解决办法](https://github.com/getlantern/lantern/wiki) When you have a problem when using Lantern, please refer to [FAQ](https://github.com/getlantern/lantern/wiki)** 
 
-## Building Mobile
+**If you would like to give the latest but more UNSTABLE BETA versions a try, you can find all of them at the following links:** **如果希望试用最新测试版，请点击如下下载链接：**
+- [Android](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-preview.apk)
+- [Windows 7 and above](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-preview.exe)
+- [OSX 10.10 and above](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-preview.dmg)
+- [Ubuntu 14.04 32 bit](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-preview-32-bit.deb)
+- [Ubuntu 14.04 64 bit](https://raw.githubusercontent.com/getlantern/lantern-binaries/master/lantern-installer-preview-64-bit.deb)
 
-### Mobile Prerequisites
+**第一次下载安装蓝灯时，请等待几分钟以便完成配置，笔芯**
 
-Building the mobile library and app requires the following:
+**Please allow some time for Lantern to complete configurations if installing it for the first-time, love <3**
 
-1. Install Java JDK 7 or 8
-2. Install Go 1.6 or higher
-3. Install [Android SDK Tools](http://developer.android.com/sdk/index.html#Other)
-4. Install NDK(http://developer.android.com/ndk/downloads/index.html)
-
-Make sure to set these environment variables before trying to build any Android
-components (replace the paths based on wherever you've installed the Android
-SDK and NDK).
-
-```bash
-export ANDROID_HOME=/opt/adt-bundle-mac-x86_64-20130917/sdk
-export PATH=$ANDROID_HOME/tools:$ANDROID_HOME/platform-tools:$ANDROID_HOME/build-tools:$PATH
-export NDK_HOME=/opt/android-ndk-r10e
-export PATH=$NDK_HOME:$PATH
-```
-
-### Go Android Library
-
-The core Lantern functionality can be packaged into a native Android library
-with:
-
-```
-make android-lib
-```
-
-### Java Android SDK
-
-The Java-based Android SDK allows easy embedding of Lantern functionality in 3rd
-party Android apps such as Manoto TV. The SDK can be built with:
-
-```
-make android-sdk
-```
-
-### Lantern Mobile Testbed
-
-This simple Android application provides a way to test the Android SDK. It can
-be built with:
-
-```
-make android-testbed
-```
-
-### Lantern Mobile App
-
-
-## Debug
-
-To create a debug build of the full lantern mobile app:
-
-```
-make android-debug
-```
-
-To install on the default device:
-
-```
-make android-install
-```
-
-## Release
-
-To create a release build, add the following to your
-``~/.gradle/gradle.properties`` file:
-
-```
-KEYSTORE_PWD=$KEYSTORE_PASSWORD
-KEYSTORE_FILE=keystore.release.jks
-KEY_PWD=$KEY_PASSWORD
-```
-
-You can find the exact values to add to your gradle.properties
-[here](https://github.com/getlantern/too-many-secrets/blob/master/android/keystore).
-
-Then it can be built with:
-
-```sh
-SECRETS_DIR=$PATH_TO_TOO_MANY_SECRETS \
-VERSION=2.0.0-beta1 make android-release
-```
-
-### Android Tips
-#### Android Studio
-To get the build working for Android Studio, you'll want to add the following
-dummy values to your ``~/.gradle/gradle.properties`` file:
-
-```
-lanternRevisionDate="April 26, 2016"
-lanternVersion=2.2.1
-```
-
-#### Uninstall for All Users
-If you use `adb` to install and debug an app to your Android device during
-development and then subsequently build a signed APK and try to install it on
-that same device, you may receive an unhelpful error saying "App Not Installed".
-This typically means that you tried to install the same app but signed with a
-different key.  The solution is to uninstall the app first, but **you have to
-uninstall it for all users**. You can do this by selecting "Uninstall for all
-users" from:
-
-```
-Settings -> Apps -> [Pick the App] -> Hamburger Menu (...) -> Uninstall for all users.
-```
-
-If you forget to do this and just uninstall normally, you'll still encounter the
-error. To fix this, you'll have to run the app with `adb` again and then
-uninstall for all users.
-
-#### Getting HTTP Connections to Use Proxy
-
-In android, programmatic access to HTTP resources typically uses the
-`HttpURLConnection` class.  You can tell it to use a proxy by setting some
-system properties:
-
-```java
-System.setProperty("http.proxyHost", host);
-System.setProperty("http.proxyPort", port);
-System.setProperty("https.proxyHost", host);
-System.setProperty("https.proxyPort", port);
-```
-
-You can disable proxying by clearing those properties:
-
-```java
-System.clearProperty("http.proxyHost");
-System.clearProperty("http.proxyPort");
-System.clearProperty("https.proxyHost");
-System.clearProperty("https.proxyPort");
-```
-
-However, there is one big caveat - **`HttpURLConnection` uses keep-alives to
-reuse existing TCP connections**. These TCP connections will still be using the
-old proxy settings. This has several implications:
-
-**Set the proxy settings as early in the application's lifecycle as possible**,
-ideally before any `HttpURLConnection`s have been opened.
-
-**Don't expect the settings to take effect immediately** if some
-`HttpURLConnection`s have already been opened.
-
-**Disable keep-alives if you need to**, which you can do like this:
-
-```java
-HttpURLConnection urlConnection = (HttpURLConnection) url.openConnection();
-// Need to force closing so that old connections (with old proxy settings) don't get reused.
-urlConnection.setRequestProperty("Connection", "close");
-```
-
-## Building Lantern for running on a server
-To run Lantern on a server, you simply need to set a flag to build it in headless mode and then tell it to run on any local address as opposed to binding to localhost (so that it's accessible from other machines). You can do this as follows:
-
-1. ```HEADLESS=true make docker-linux``` or, if you're already running on Linux just ```HEADLESS=true make linux```
-1. ```./lantern_linux_amd64 --addr 0.0.0.0:8787``` or ```./lantern_linux_386 --addr 0.0.0.0:8787```
-
-## Other
-### Generating assets
-
-```sh
-make genassets
-```
-
-If the environment variable `UPDATE_DIST=true` is set, `make genassets` also
-updates the resources in the dist folder.
-
-An annotated tag can be added like this:
-
-```sh
-git tag -a v1.0.0 -m"Tagged 1.0.0"
-git push --tags
-```
-
-Use `make create-tag` as a shortcut for creating and uploading tags:
-
-```
-VERSION='2.0.0-beta5' make create-tag
-```
-
-If you want to both create a package and upload a tag, run the `create-tag` task
-right after the `packages` task:
-
-```
-[...env variables...] make packages create-tag
-```
-
-### Updating Icons
-
-The icons used for the system tray are stored in
-`src/github/getlantern/lantern/icons`. To apply changes to the icons, make
-your updates in the icons folder and then run `make update-icons`.
-
-### Continuous Integration with Travis CI
-
-Continuous builds are run on Travis CI. These builds use the `.travis.yml`
-configuration.  The github.com/getlantern/cf unit tests require an envvars.bash
-to be populated with credentials for cloudflare. The original `envvars.bash` is
-available
-[here](https://github.com/getlantern/too-many-secrets/blob/master/envvars.bash).
-An encrypted version is checked in as `envvars.bash.enc`, which was encrypted
-per the instructions [here](https://docs.travis-ci.com/user/encrypting-files/).
-
-
-## Documentation for developers
-
-### Dev README
-
-Please, go to [README-dev](README-dev.md) for an in-depth explanation of the Lantern internals and cloud services.
-
-### Release README
-
-Please visit [README-release](README-release.md) for details on building release versions of Lantern.
-
-### Translations README
-
-More info for dealing with translations is available in [README-translations](README-translations.md).
-
-### Contributing changes
-Lantern is a [gost](https://github.com/getlantern/gost) project that
-provides repeatable builds and consolidated pull requests for lantern.
-
-Go code in Lantern must pass several tests:
-
-* [errcheck](https://github.com/kisielk/errcheck)
-* [golint](https://github.com/golang/lint)
-* Go vet
-* Go test -race
-
-You can find a generic [git-hook](https://github.com/getlantern/lantern/blob/valencia/pre-push)
-file, which can be used as a pre-push (or pre-commit) hook to automatically
-ensure these tests are passed before committing any code. Only Go packages in
-`src/github.com/getlantern` will be tested, and only those that have changes in
-them.
-
-Install by copying it into the local `.git/hooks/` directory, with the `pre-push`
-file name if you want to run it before pushing. Alternatively, you can copy
-[pre-commit.hook](https://github.com/getlantern/lantern/blob/valencia/pre-commit)
-to `pre-commit` to run it before each commit.
-
-```bash
-ln -s "$(pwd)/prehook.sh" .git/hooks/prehook.sh
-ln -s "$(pwd)/pre-push" .git/hooks/pre-push
-```
-
-**Important notice**
-
-If you *must* commit without running the hooks, you can run git with the
-`--no-verify` flag.
-
-
-
-[1]: https://help.github.com/articles/creating-an-access-token-for-command-line-use/
diff --git a/.gitignore → archive/.gitignore b/.gitignore → archive/.gitignore
@@ -32,7 +32,6 @@ src/github.com/getlantern/autoupdate/_test_app/main.go
 src/github.com/getlantern/autoupdate/_test_app/autoupdate-binary-*
 src/github.com/getlantern/autoupdate/_test_app/main
 src/github.com/getlantern/flashlight/ui/resources.go
-src/github.com/getlantern/flashlight/*.syso
 src/github.com/getlantern/systray/sysdtray.sdf
 src/github.com/getlantern/systray/Debug
 src/github.com/getlantern/systray/Release
@@ -43,7 +42,7 @@ installer-resources/linux/.packaged-lantern.yaml
 installer-resources/darwin/lantern_versioned.dmg.json
 installer-resources/darwin/dmgbackground.png
 installer-resources/darwin/dmgbackground_versioned.svg
-src/github.com/getlantern/lantern-ui/dist
+lantern-ui/dist
 lantern.yaml
 LanternMobileTestbed/app/libs/
 *.apk
@@ -58,8 +57,12 @@ local.properties
 .gradle
 build
 keystore.release.jks
-src/github.com/getlantern/lantern-ui/app/js/revision.js
+lantern-ui/app/js/revision.js
 bns.pfx
 cmd.exe
 lantern-installer*
 src/github.com/getlantern/rotator/test_daily.log
+src/github.com/getlantern/flashlight/app/*.pem
+src/github.com/getlantern/flashlight/app/lantern-9999.99.99.yaml
+src/github.com/getlantern/flashlight/app/obfs4_bridgeline.txt
+src/github.com/getlantern/flashlight/app/obfs4_state.json
diff --git a/archive/.gitmodules b/archive/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "src/github.com/getlantern/http-proxy-lantern"]
+	path = archive/src/github.com/getlantern/http-proxy-lantern
+	url = git@github.com:getlantern/http-proxy-lantern.git
diff --git a/.gost → archive/.gost b/.gost → archive/.gost
diff --git a/.travis.yml → archive/.travis.yml b/.travis.yml → archive/.travis.yml
@@ -1,16 +1,27 @@
 language: go
 go:
 - 1.6
+node_js:
+- 5.1
+git:
+    # Handle git submodules ourselves
+    submodules: false
 install:
 - sudo apt-get install make -y
 - go get golang.org/x/tools/cmd/cover
 - go get -v github.com/mattn/goveralls
+- curl https://s3-eu-west-1.amazonaws.com/uaalto/go1.6.2_lantern_20160503_linux_amd64.tar.gz | tar -xz -C /tmp && rm -Rf /usr/local/go && sudo mv /tmp/go /usr/local
+before_script:
+- npm install -g gulp-cli
 script:
 - openssl aes-256-cbc -K $encrypted_f217260732a9_key -iv $encrypted_f217260732a9_iv
   -in envvars.bash.enc -out envvars.bash -d
-- make test-and-cover
+- GOROOT=/usr/local/go make test-and-cover
 after_success:
 - GOPATH=`pwd`:$GOPATH $HOME/gopath/bin/goveralls -coverprofile=profile.cov -service=travis-ci
 before_install:
+- echo -e "machine github.com\n  login $CI_USER_TOKEN" >> ~/.netrc
 - openssl aes-256-cbc -K $encrypted_f217260732a9_key -iv $encrypted_f217260732a9_iv
   -in envvars.bash.enc -out envvars.bash -d
+- sed -i 's/git@github.com:/https:\/\/github.com\//' .gitmodules
+- git submodule update --init --recursive
diff --git a/Dockerfile → archive/Dockerfile b/Dockerfile → archive/Dockerfile
@@ -58,13 +58,12 @@ RUN yum -y install nodejs && yum clean packages
 RUN npm install -g gulp
 
 # Getting Go.
-ENV GO_VERSION go1.6
 ENV GOROOT /usr/local/go
 ENV GOPATH /
 
 ENV PATH $PATH:$GOROOT/bin
 
-ENV GO_PACKAGE_URL https://storage.googleapis.com/golang/$GO_VERSION.linux-amd64.tar.gz
+ENV GO_PACKAGE_URL https://s3-eu-west-1.amazonaws.com/uaalto/go1.6.2_lantern_20160503_linux_amd64.tar.gz
 RUN curl -sSL $GO_PACKAGE_URL | tar -xvzf - -C /usr/local
 
 # Expect the $WORKDIR volume to be mounted.