Rod Hynes 07d155cb6f Merge branch 'master' into tactics		%!s(int64=8) %!d(string=hai) anos
..
PsiphonTunnel	6522944c4f Integrate GetNetworkID on iOS and Android	%!s(int64=8) %!d(string=hai) anos
SampleApps	6f24dc9ebc Fix: iOS sample app build errors related to a89bd2d	%!s(int64=8) %!d(string=hai) anos
.gitignore	72dc700e86 Fix problems with config init	%!s(int64=8) %!d(string=hai) anos
BUILD.md	9aeb7dafe3 Add brief instruction on running tests	%!s(int64=9) %!d(string=hai) anos
README.md	c81c565511 Remove mention of OpenSSL from iOS library README	%!s(int64=8) %!d(string=hai) anos
USAGE.md	b551866b7b Add note about proxying web view to iOS library usage	%!s(int64=8) %!d(string=hai) anos
build-psiphon-framework.sh	600bc7d2b8 Use Go 1.9.5	%!s(int64=8) %!d(string=hai) anos
test-psiphon-framework.sh	3af72f5675 Move testing to separate script (mostly because they won't run on the build machine)	%!s(int64=9) %!d(string=hai) anos

Psiphon iOS Library Meta-README

Usage

If you are using the Library in your app, please read the USAGE.md instructions.