* master:
ASN1: test case updates
ASN1: add test cases for latest changes
ASN1: CS update
ASN1: make developing new ASN.1 scripts a little easier
ASN1: make it so bit string's can have an optional minimum size
ASN1: explicit application tags didn't work (although implicit ones did)
ASN1 changes
* terrafrost/keberos-fix:
ASN1: test case updates
ASN1: add test cases for latest changes
ASN1: CS update
ASN1: make developing new ASN.1 scripts a little easier
ASN1: make it so bit string's can have an optional minimum size
ASN1: explicit application tags didn't work (although implicit ones did)
* master:
Use "Development Dependencies" instead of "Dependencies" for less confusion.
Capitalisation improvements.
Add Contributing section to README.md
Add section about Dependency Installation to README.md
Add "Installing Dependencies" and "Contributing" sections to README.md
* bantu/readme-update:
Use "Development Dependencies" instead of "Dependencies" for less confusion.
Capitalisation improvements.
Add Contributing section to README.md
Add section about Dependency Installation to README.md
Install PHPUnit via Composer and update to version 4.0.
* bantu/phpunit-4-via-composer:
Update composer before using it. Fixes openssl for https error.
Install PHPUnit via Composer and update to version 4.0.
* master:
SSH2: move _connect() call to _login() from login()
SSH2: phpdoc updates
SSH: clarify role of constructor / connection timeout
SSH1: do fsockopen() call when login has been called
SSH2: != -> |=
SSH2: phpdoc changes
SSH2: syntax error
SSH2: timeout set in constructor != timeout set by setTimeout()
SSH2: add phpdoc header
SSH2: connect to server in login() function
Conflicts:
phpseclib/Net/SSH2.php
SSH2: connect to server in login() function
* terrafrost/ssh2-connect-after-login:
SSH2: move _connect() call to _login() from login()
SSH2: phpdoc updates
SSH: clarify role of constructor / connection timeout
SSH1: do fsockopen() call when login has been called
SSH2: != -> |=
SSH2: phpdoc changes
SSH2: syntax error
SSH2: timeout set in constructor != timeout set by setTimeout()
SSH2: add phpdoc header
SSH2: connect to server in login() function
Setup Travis CI phpseclib user home directory accordingly.
* bantu/travis-home-directory:
Use pwd instead of ls. If the directory is empty callback will not be called.
Setup Travis CI phpseclib user home directory accordingly.
Also, in Net_SSH2::_connect() $host is used in multiple places. Rather than changing all references to {$this->host}:{$this->port} preserve existing $host reference and update it accordingly
