From 74c40a7cbe501ccacbe01a0c45250c6f943aae4c Mon Sep 17 00:00:00 2001
From: Matthieu Napoli <matthieu@mnapoli.fr>
Date: Mon, 4 Jan 2016 16:54:09 +0100
Subject: [PATCH 1/3] #842 Add 2.0.0 changelog

---
 CHANGELOG.md | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0b03dc7..06134ebe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## 2.0.0 - 2015-08-04
+
+- Classes were renamed and namespaced ([#243](https://github.com/phpseclib/phpseclib/issues/243))
+- The use of an autoloader is now required (e.g. Composer)
+
 ## 1.0.0 - 2015-08-02
 
 - OpenSSL support for symmetric ciphers ([#507](https://github.com/phpseclib/phpseclib/pull/507))
@@ -102,4 +107,4 @@
 = add support for AES-128-CBC and DES-EDE3-CFB encrypted RSA private keys
 - add Net_SFTP::stat(), Net_SFTP::lstat() and Net_SFTP::rawlist()
 - logging was added to Net_SSH1
-- the license was changed to the less restrictive MIT license
\ No newline at end of file
+- the license was changed to the less restrictive MIT license

From c24ee966adac6c28feae2d1fe530b18c44235088 Mon Sep 17 00:00:00 2001
From: Michele Locati <michele@locati.it>
Date: Mon, 11 Jan 2016 08:50:47 +0100
Subject: [PATCH 2/3] Exclude some dirs and files from repository
 auto-generated ZIP archives

---
 .gitattributes | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/.gitattributes b/.gitattributes
index 176a458f..484960de 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1 +1,9 @@
 * text=auto
+/build/ export-ignore
+/tests/ export-ignore
+/travis/ export-ignore
+/.gitattributes export-ignore
+/.gitignore export-ignore
+/.travis.yml export-ignore
+/CHANGELOG.md export-ignore
+/phpunit.xml.dist export-ignore

From 0905143fc1f42f7486614060a95a57a433ee5c7c Mon Sep 17 00:00:00 2001
From: terrafrost <terrafrost@php.net>
Date: Wed, 13 Jan 2016 16:51:12 -0600
Subject: [PATCH 3/3] SSH/Agent: fix possible PHP Warning

---
 phpseclib/System/SSH/Agent.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/phpseclib/System/SSH/Agent.php b/phpseclib/System/SSH/Agent.php
index 519a60f6..4ca34d4c 100644
--- a/phpseclib/System/SSH/Agent.php
+++ b/phpseclib/System/SSH/Agent.php
@@ -321,7 +321,9 @@ class System_SSH_Agent
             $length = current(unpack('N', fread($this->fsock, 4)));
             $key_blob = fread($this->fsock, $length);
             $length = current(unpack('N', fread($this->fsock, 4)));
-            $key_comment = fread($this->fsock, $length);
+            if ($length) {
+                $key_comment = fread($this->fsock, $length);
+            }
             $length = current(unpack('N', substr($key_blob, 0, 4)));
             $key_type = substr($key_blob, 4, $length);
             switch ($key_type) {