diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix
new file mode 100644
index 000000000000..60947bc769c7
--- /dev/null
+++ b/pkgs/development/python-modules/txtorcon/default.nix
@@ -0,0 +1,39 @@
+{lib, buildPythonPackage, fetchPypi, isPy3k, incremental, ipaddress, twisted
+, automat, zope_interface, idna, pyopenssl, service-identity, pytest, mock, lsof
+, GeoIP}:
+
+buildPythonPackage rec {
+  name = "${pname}-${version}";
+  pname = "txtorcon";
+  version = "0.19.3";
+
+  checkInputs = [ pytest mock lsof GeoIP ];
+  propagatedBuildInputs = [
+    incremental twisted automat zope_interface
+    # extra dependencies required by twisted[tls]
+    idna pyopenssl service-identity
+  ] ++ lib.optionals (!isPy3k) [ ipaddress ];
+
+  src = fetchPypi {
+    inherit pname version;
+    sha256 = "1za4qag4g2lbw695v4ssxqc2aspdyknnbn2diylwg8q9g5k9cczp";
+  };
+
+  # ipaddress isn't required for Python 3 although it's in requirements.txt.
+  # Because ipaddress doesn't install on Python 3, remove the requirement so the
+  # installation of this package doesn't fail on Python 3.
+  postPatch = "" + lib.optionalString isPy3k ''
+    substituteInPlace requirements.txt --replace "ipaddress>=1.0.16" ""
+  '';
+
+  checkPhase = ''
+    pytest .
+  '';
+
+  meta = {
+    description = "Twisted-based Tor controller client, with state-tracking and configuration abstractions";
+    homepage = https://github.com/meejah/txtorcon;
+    maintainers = with lib.maintainers; [ jluttine ];
+    license = lib.licenses.mit;
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index de79d5dc5020..1ba770ac0315 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -22736,6 +22736,8 @@ in {
 
   twisted = callPackage ../development/python-modules/twisted { };
 
+  txtorcon = callPackage ../development/python-modules/txtorcon { };
+
   tzlocal = callPackage ../development/python-modules/tzlocal { };
 
   u-msgpack-python = callPackage ../development/python-modules/u-msgpack-python { };