Merge remote-tracking branch 'davidchiles/bootstrap-progress'
Add methods to retreive dependency versions
Merge pull request #12 from davidchiles/tor-status

Make tor status a public readonly property
Added GCDAsyncSocket
Refactored commands and responses

Refactored how commands are created and handled. Added multi line
response handling.
Merge branch 'upstream' into GCDAsyncSocket
Use xcpretty instead of xctool for Travis builds
Change URLs in readme from fork to original repo
Merge pull request #14 from ChatSecure/master

Configurable Tor path #9 and completion/progress block for setup #11
Update to OpenSSL 1.0.1j and Tor 0.2.5.9-rc
Update README
Merge pull request #17 from chrisballinger/dep-update

Update to OpenSSL1.0.1j and Tor 0.2.5.9-rc
Add methods to retreive dependency versions

Use xcpretty instead of xctool for Travis builds

Change URLs in readme from fork to original repo

comment method updated

Added method parameter for responseQueue

Add completion queue

Spelling fix for CPAResponse

naming fix

Fixed spelling error

fixed naming

spelling fix
Merge branch 'upstream' into GCDAsyncSocket

Conflicts:
	.travis.yml
	CPAProxy/CPAProxyManager.h
	CPAProxy/CPAProxyManager.m
Reverted travis merge error