From cb982af63580b413aca8c7dca52a413423c8ceb9 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 14 Sep 2016 10:27:39 -0700
Subject: [PATCH 1/2] put dnspython in alphabetical order

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 19297d38d..2033a9ee5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -32,10 +32,10 @@ setenv =
 deps =
     py{26,27}-oldest: cryptography==0.8
     py{26,27}-oldest: configargparse==0.10.0
+    py{26,27}-oldest: dnspython>=1.12
     py{26,27}-oldest: psutil==2.1.0
     py{26,27}-oldest: PyOpenSSL==0.13
     py{26,27}-oldest: python2-pythondialog==3.2.2rc1
-    py{26,27}-oldest: dnspython>=1.12
 
 [testenv:py33]
 commands =

From cd74a07edfaf676b7eb30f179cb1d8e0da0ebd89 Mon Sep 17 00:00:00 2001
From: Brad Warren <bmw@eff.org>
Date: Wed, 14 Sep 2016 10:31:31 -0700
Subject: [PATCH 2/2] Fix Travis tests due to cffi error

---
 tox.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tox.ini b/tox.ini
index 2033a9ee5..ac39e995e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -29,7 +29,10 @@ setenv =
     PYTHONHASHSEED = 0
 # https://testrun.org/tox/latest/example/basic.html#special-handling-of-pythonhas
 
+# cffi<=1.7 is required for oldest tests due to
+# https://bitbucket.org/cffi/cffi/commits/18cdf37d6b2691301a15b0e54f49757ebd4ed0f2?at=default
 deps =
+    py{26,27}-oldest: cffi<=1.7
     py{26,27}-oldest: cryptography==0.8
     py{26,27}-oldest: configargparse==0.10.0
     py{26,27}-oldest: dnspython>=1.12