diff --git a/package.yml b/package.yml
--- a/package.yml
+++ b/package.yml
@@ -1,8 +1,8 @@
 name       : python-txtorcon
-version    : 0.20.0
-release    : 2
+version    : 20.0.0
+release    : 3
 source     :
-    - https://github.com/meejah/txtorcon/archive/v0.20.0.tar.gz : 75c5880b25dcf613129351d69c1682c111a33c3243c99a0642026a7a8f9247ae
+    - https://github.com/meejah/txtorcon/archive/v20.0.0.tar.gz : 8b5f5587ab03bb965c4d162b8ef86c6853c06041b200f2f8a2272caa4bd7cac4
 license    : MIT
 component  : programming.python
 summary    : A Twisted-based Python asynchronous controller library for Tor
diff --git a/pspec_x86_64.xml b/pspec_x86_64.xml
--- a/pspec_x86_64.xml
+++ b/pspec_x86_64.xml
@@ -2,8 +2,8 @@
     <Source>
         <Name>python-txtorcon</Name>
         <Packager>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Alec Scott</Name>
+            <Email>alecbcs@gmail.com</Email>
         </Packager>
         <License>MIT</License>
         <PartOf>programming.python</PartOf>
@@ -19,55 +19,13 @@
 </Description>
         <PartOf>programming.python</PartOf>
         <Files>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__init__.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/__init__.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/py3_torstate.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_addrmap.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_attacher.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_circuit.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_controller.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_endpoints.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_fsm.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_log.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_microdesc.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_router.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_socks.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_stream.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_torconfig.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_torcontrolprotocol.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_torinfo.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_torstate.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_util.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_util_imports.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/test_web.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/__pycache__/util.cpython-37.pyc</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/py3_torstate.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_addrmap.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_attacher.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_circuit.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_controller.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_endpoints.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_fsm.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_log.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_microdesc.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_router.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_socks.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_stream.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_torconfig.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_torcontrolprotocol.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_torinfo.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_torstate.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_util.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_util_imports.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/test_web.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/test/util.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/twisted/plugins/__pycache__/txtorcon_endpoint_parser.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/twisted/plugins/txtorcon_endpoint_parser.py</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-0.20.0-py3.7.egg-info/PKG-INFO</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-0.20.0-py3.7.egg-info/SOURCES.txt</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-0.20.0-py3.7.egg-info/dependency_links.txt</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-0.20.0-py3.7.egg-info/requires.txt</Path>
-            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-0.20.0-py3.7.egg-info/top_level.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-20.0.0-py3.7.egg-info/PKG-INFO</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-20.0.0-py3.7.egg-info/SOURCES.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-20.0.0-py3.7.egg-info/dependency_links.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-20.0.0-py3.7.egg-info/requires.txt</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon-20.0.0-py3.7.egg-info/top_level.txt</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__init__.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/__init__.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/_metadata.cpython-37.pyc</Path>
@@ -76,13 +34,16 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/attacher.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/circuit.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/controller.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/controller_py3.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/endpoints.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/interface.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/log.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/onion.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/router.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/socks.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/spaghetti.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/stream.cpython-37.pyc</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/testutil.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/torconfig.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/torcontrolprotocol.cpython-37.pyc</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/__pycache__/torinfo.cpython-37.pyc</Path>
@@ -95,13 +56,16 @@
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/attacher.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/circuit.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/controller.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/controller_py3.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/endpoints.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/interface.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/log.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/onion.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/router.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/socks.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/spaghetti.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/stream.py</Path>
+            <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/testutil.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/torconfig.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/torcontrolprotocol.py</Path>
             <Path fileType="library">/usr/lib/python3.7/site-packages/txtorcon/torinfo.py</Path>
@@ -116,6 +80,7 @@
             <Path fileType="data">/usr/share/txtorcon/avatar.png</Path>
             <Path fileType="data">/usr/share/txtorcon/conf.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples.rst</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/close_all_circuits.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/connect.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/disallow_streams_by_port.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/dns_lookups.py</Path>
@@ -129,19 +94,29 @@
             <Path fileType="data">/usr/share/txtorcon/examples/minimal_endpoint.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/monitor.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/readme.py</Path>
-            <Path fileType="data">/usr/share/txtorcon/examples/readme3.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/readme2.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/stem_relay_descriptor.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/stream_circuit_logger.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/tor_info.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/web_client.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_client_authenticated.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/web_client_custom_circuit.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/web_client_treq.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_onion_service_aiohttp.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_onion_service_endpoints.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_onion_service_ephemeral_auth.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_onion_service_ephemeral_nonanon.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_onion_service_ephemeral_unix.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_onion_service_filesystem.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_onion_service_prop224.py</Path>
+            <Path fileType="data">/usr/share/txtorcon/examples/web_onion_service_prop224_endpoints_file.py</Path>
             <Path fileType="data">/usr/share/txtorcon/examples/webui_server.py</Path>
             <Path fileType="data">/usr/share/txtorcon/guide.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/hacking.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/haiku.css</Path>
             <Path fileType="data">/usr/share/txtorcon/index.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/installing.rst</Path>
+            <Path fileType="data">/usr/share/txtorcon/interop_asyncio.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/introduction.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/logo.png</Path>
             <Path fileType="data">/usr/share/txtorcon/logo.svg</Path>
@@ -152,6 +127,7 @@
             <Path fileType="data">/usr/share/txtorcon/txtorcon-controller.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/txtorcon-endpoints.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/txtorcon-interface.rst</Path>
+            <Path fileType="data">/usr/share/txtorcon/txtorcon-onion.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/txtorcon-protocol.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/txtorcon-socks.rst</Path>
             <Path fileType="data">/usr/share/txtorcon/txtorcon-state.rst</Path>
@@ -160,12 +136,12 @@
         </Files>
     </Package>
     <History>
-        <Update release="2">
-            <Date>2020-01-26</Date>
-            <Version>0.20.0</Version>
+        <Update release="3">
+            <Date>2020-04-30</Date>
+            <Version>20.0.0</Version>
             <Comment>Packaging update</Comment>
-            <Name>Joey Riches</Name>
-            <Email>josephriches@gmail.com</Email>
+            <Name>Alec Scott</Name>
+            <Email>alecbcs@gmail.com</Email>
         </Update>
     </History>
 </PISI>
\ No newline at end of file