diff -Nru kxd-0.14/debian/changelog kxd-0.14/debian/changelog
--- kxd-0.14/debian/changelog	2019-10-03 16:28:56.000000000 +0000
+++ kxd-0.14/debian/changelog	2020-04-05 09:17:44.000000000 +0000
@@ -1,3 +1,15 @@
+kxd (0.14-2) unstable; urgency=medium
+
+  [ Håvard Flaget Aasen ]
+  * Set absolute path in d/rules (Closes: #952332)
+  * Cherry-pick upstream commit, needed for upstream testsuite.
+    0001-tests-Add-missing-conn.getresponse-which-was-causing.patch
+
+  [ Maximiliano Curia ]
+  * Release to unstable
+
+ -- Maximiliano Curia <maxy@debian.org>  Sun, 05 Apr 2020 11:17:44 +0200
+
 kxd (0.14-1) unstable; urgency=medium
 
   [ Michael Stapelberg ]
diff -Nru kxd-0.14/debian/patches/0001-tests-Add-missing-conn.getresponse-which-was-causing.patch kxd-0.14/debian/patches/0001-tests-Add-missing-conn.getresponse-which-was-causing.patch
--- kxd-0.14/debian/patches/0001-tests-Add-missing-conn.getresponse-which-was-causing.patch	1970-01-01 00:00:00.000000000 +0000
+++ kxd-0.14/debian/patches/0001-tests-Add-missing-conn.getresponse-which-was-causing.patch	2020-04-05 09:17:44.000000000 +0000
@@ -0,0 +1,30 @@
+From: Alberto Bertogli <albertito@blitiri.com.ar>
+Date: Sun, 29 Mar 2020 11:40:46 +0100
+Subject: tests: Add missing conn.getresponse() which was causing false
+ negatives
+
+Somewhere around Python 3.8, http.client.HTTPConnection objects changed
+how result handling was done, and ignored SSL errors until
+.getresponse() was called.
+
+This causes the test_no_local_cert to fail, even though the server is
+responding correctly.
+
+This patch fixes this by adding a .getresponse() call, which forces
+validation of the result and makes the test pass again.
+---
+ tests/run_tests | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/tests/run_tests b/tests/run_tests
+index d6d4ba2..9499bfe 100755
+--- a/tests/run_tests
++++ b/tests/run_tests
+@@ -407,6 +407,7 @@ class TrickyRequests(TestCase):
+         conn = self.https_connection("localhost", 19840)
+         try:
+             conn.request("GET", "/v1/")
++            conn.getresponse()
+             conn.close()
+         except ssl.SSLError as err:
+             self.assertEqual(err.reason, "SSLV3_ALERT_BAD_CERTIFICATE")
diff -Nru kxd-0.14/debian/patches/series kxd-0.14/debian/patches/series
--- kxd-0.14/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ kxd-0.14/debian/patches/series	2020-04-05 09:17:44.000000000 +0000
@@ -0,0 +1 @@
+0001-tests-Add-missing-conn.getresponse-which-was-causing.patch
diff -Nru kxd-0.14/debian/rules kxd-0.14/debian/rules
--- kxd-0.14/debian/rules	2019-10-03 16:28:56.000000000 +0000
+++ kxd-0.14/debian/rules	2020-04-05 09:17:44.000000000 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
-export GOCACHE=$$(pwd)/debian/cache
+export GOCACHE=$(CURDIR)/debian/cache
 
 %:
 	dh $@