diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index f3486d2..544cdc6 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -15,9 +15,11 @@ optdepends=('tor: tor-server to talk to')
 replaces=('stem')
 provides=('stem')
 source=(https://files.pythonhosted.org/packages/source/${_pypiname::1}/${_pypiname}/${_pypiname}-${pkgver}.tar.gz{,.asc}
+        b5aecb743d33db1a6378d59792d8e57305b6c6f2.patch::https://gitweb.torproject.org/stem.git/patch/?id=b5aecb743d33db1a6378d59792d8e57305b6c6f2
         stem-python-3.8.patch)
 sha256sums=('c9eaf3116cb60c15995cbd3dec3a5cbc50e9bb6e062c4d6d42201e566f498ca2'
             'SKIP'
+            '36acf759d65741ce456bdec656a0bda1dc6b5135bc4b14c785fbae67c5ac5a8e'
             '294e645ceba300c34693df2e8269c844686f3a1bb7b9bb1e3ffc6882a07f2505')
 validpgpkeys=('68278CC5DD2D1E85C4E45AD90445B7AB9ABBEEC6') # Damian Johnson (www.atagar.com) <atagar1@gmail.com>
 
@@ -27,8 +29,11 @@ prepare() {
   sed -i test/settings.cfg \
     -e '/|test.integ.client.connection.TestConnection/d' \
     -e '/|test.integ.process.TestProcess/d' \
-    -e '/|test.integ.installation.TestInstallation/d'
-  rm test/integ/{client/connection,{installation,process}}.py
+    -e '/|test.integ.installation.TestInstallation/d' \
+    -e '/|test.unit.installation.TestInstallation/d'
+  rm test/{integ/{client/connection,{installation,process}},unit/installation}.py
+
+  patch -p1 -i ../b5aecb743d33db1a6378d59792d8e57305b6c6f2.patch
 
   # fix tests with python 3.8
   patch -p1 -i ../stem-python-3.8.patch
diff --git a/trunk/b5aecb743d33db1a6378d59792d8e57305b6c6f2.patch b/trunk/b5aecb743d33db1a6378d59792d8e57305b6c6f2.patch
new file mode 100644
index 0000000..d5ea255
--- /dev/null
+++ b/trunk/b5aecb743d33db1a6378d59792d8e57305b6c6f2.patch
@@ -0,0 +1,29 @@
+From b5aecb743d33db1a6378d59792d8e57305b6c6f2 Mon Sep 17 00:00:00 2001
+From: Damian Johnson <atagar@torproject.org>
+Date: Fri, 14 Jun 2019 11:56:04 -0700
+Subject: Controller's get_conf_map concurrently modified dictionary
+
+Oddly I'm not reproing this issue when I run the tests, but I definitely see
+the bug. Iteration requires a shallow copy of the dictionary's keys.
+
+  https://trac.torproject.org/projects/tor/ticket/30882
+---
+ stem/control.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/stem/control.py b/stem/control.py
+index a821634..d8423ff 100644
+--- a/stem/control.py
++++ b/stem/control.py
+@@ -2361,7 +2361,7 @@ class Controller(BaseController):
+       # entries since the user didn't request those by their key, so we can't
+       # be sure what they wanted.
+ 
+-      for key in reply:
++      for key in list(reply):
+         if not key.lower() in MAPPED_CONFIG_KEYS.values():
+           user_expected_key = _case_insensitive_lookup(params, key, key)
+ 
+-- 
+cgit v1.1
+