From a424eff309258ddd32d1bb707df1aba31bf36bef Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 25 Aug 2013 10:34:14 +1200
Subject: [PATCH 1/3] Version bump and changelog.

---
 CHANGELOG            | 5 +++++
 libpathod/version.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG b/CHANGELOG
index 3373eb711..55b11342f 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,8 @@
+25 August 2013: pathod 0.9.2:
+
+    * Adapt to interface changes in netlib
+    
+
 15 May 2013: pathod 0.9 (version synced with mitmproxy):
 
     * Pathod proxy mode. You can now configure clients to use pathod as an
diff --git a/libpathod/version.py b/libpathod/version.py
index af62b6787..32dcf30db 100644
--- a/libpathod/version.py
+++ b/libpathod/version.py
@@ -1,4 +1,4 @@
-IVERSION = (0, 9, 1)
+IVERSION = (0, 9, 2)
 VERSION = ".".join(str(i) for i in IVERSION)
 NAME = "pathod"
 NAMEVERSION = NAME + " " + VERSION

From d2855089941b9f55a0625458130c69a6124655ab Mon Sep 17 00:00:00 2001
From: Aldo Cortesi <aldo@nullcube.com>
Date: Sun, 25 Aug 2013 10:45:16 +1200
Subject: [PATCH 2/3] Fix download link.

---
 libpathod/templates/index.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libpathod/templates/index.html b/libpathod/templates/index.html
index 3bc4b9a16..5e4bd842d 100644
--- a/libpathod/templates/index.html
+++ b/libpathod/templates/index.html
@@ -56,7 +56,7 @@
             <h2>source</h2>
 
             <ul>
-                <li>Current release: <a href="http://mitmproxy.org/download/pathod-0.9.1.tar.gz">pathod 0.9.1</a></li>
+                <li>Current release: <a href="http://mitmproxy.org/download/pathod-0.9.2.tar.gz">pathod 0.9.2</a></li>
 
                 <li>GitHub: <a href="http://github.com/mitmproxy/pathod">github.com/cortesi/pathod</a></li>
             </li>

From 34f5f5a5c185517b6ddfdff14a17bc919e296d75 Mon Sep 17 00:00:00 2001
From: Maximilian Hils <git@maximilianhils.com>
Date: Mon, 16 Dec 2013 03:58:46 +0100
Subject: [PATCH 3/3] add travis CI file & requirements.txt

---
 .travis.yml      | 14 ++++++++++++++
 requirements.txt | 10 ++++++++++
 2 files changed, 24 insertions(+)
 create mode 100644 .travis.yml
 create mode 100644 requirements.txt

diff --git a/.travis.yml b/.travis.yml
new file mode 100644
index 000000000..920563f53
--- /dev/null
+++ b/.travis.yml
@@ -0,0 +1,14 @@
+language: python
+python:
+  - "2.7"
+# command to install dependencies, e.g. pip install -r requirements.txt --use-mirrors
+install: 
+  - "pip install coveralls --use-mirrors"
+  - "pip install nose-cov --use-mirrors"
+  - "pip install -r requirements.txt --use-mirrors"
+  - "pip install --upgrade git+https://github.com/mitmproxy/netlib.git"
+# command to run tests, e.g. python setup.py test
+script: 
+  - "nosetests --with-cov --cov-report term-missing"
+after_success: 
+  - coveralls
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
new file mode 100644
index 000000000..73ed126ba
--- /dev/null
+++ b/requirements.txt
@@ -0,0 +1,10 @@
+Flask>=0.10.1
+Jinja2>=2.7.1
+MarkupSafe>=0.18
+Werkzeug>=0.9.4
+itsdangerous>=0.23
+nose>=1.3.0
+pyOpenSSL>=0.13.1
+pyasn1>=0.1.7
+requests>=2.1.0
+netlib>=0.9.2
\ No newline at end of file