diff --git a/Makefile b/Makefile
index e82ba9c..3437688 100644
--- a/Makefile
+++ b/Makefile
@@ -12,6 +12,9 @@ release-android-armv7: submodule-update
 release-android-x86: submodule-update
 	$(rbm) build ncdns --target release --target ncdns-android-x86
 
+release-android-aarch64: submodule-update
+	$(rbm) build ncdns --target release --target ncdns-android-aarch64
+
 release-linux-x86_64: submodule-update
 	$(rbm) build certdehydrate-dane-rest-api --target release --target ncdns-linux-x86_64
 	$(rbm) build dnssec-hsts --target release --target ncdns-linux-x86_64
diff --git a/hashlist b/hashlist
index 51fbc3a..6336d24 100644
--- a/hashlist
+++ b/hashlist
@@ -1,20 +1,20 @@
-git github.com/alecthomas/template a0175ee3bccc567396460bf5acd36800cb10c49c heads/master
-git github.com/alecthomas/units 2efee857e7cfd4f3d0138cc3cbb1b4966962b93a heads/master
+git github.com/alecthomas/template fb15b899a75114aa79cc930e33c46b577cc664b1 heads/master
+git github.com/alecthomas/units c3de453c63f4bdb4dadffab9805ec00426c505f7 heads/master
 git github.com/btcsuite/winsvc f8fb11f83f7e860e3769a08e6811d1b399a43722 tags/v1.0.0
 git github.com/BurntSushi/toml 3012a1dbe2e4bd1391d42b32f0577cb7bbc7f005 heads/master
-git github.com/coreos/go-systemd 95778dfbb74eb7e4dbaf43bf7d71809650ef8076 heads/master
-git github.com/golang/groupcache 5b532d6fd5efaf7fa130d4e859a2fde0fc3a9e1b heads/master
+git github.com/coreos/go-systemd e64a0ec8b42a61e2a9801dc1d0abe539dea79197 tags/v20
+git github.com/golang/groupcache 869f871628b6baa9cfbc11732cdf6546b17c1298 heads/master
 git github.com/hlandau/buildinfo 337a29b5499734e584d4630ce535af64c5fe7813 heads/master
 git github.com/hlandau/degoutils 8fa2440b63444dad556d76366f1c3ee070c8a577 heads/master+
 git github.com/hlandau/dexlogconfig 244f29bd260884993b176cd14ef2f7631f6f3c18 heads/master
 git github.com/hlandauf/btcjson c9ac42e8122a8d002c734a140212c50c2fc77a0e heads/master
 git github.com/hlandau/ncbtcjsontypes 02ea7272dd11bb6153a3cd06899a0999ac6a16e0 heads/master
 git github.com/hlandau/xlog 197ef798aed28e08ed3e176e678fda81be993a31 tags/v1.0.0
-git github.com/kr/pretty a0c635c0aede2cb0c2f8bb0f0d70485fbdd11bd4 heads/master
-git github.com/kr/text e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f heads/master
-git github.com/mattn/go-isatty 7fcbc72f853b92b5720db4a6b8482be612daef24 heads/master
-git github.com/miekg/dns 8a56deec68a78bfea6e73db7b086175eb8beec8b heads/master
-git github.com/miekg/pkcs11 cb39313ec884f2cd77f4762875fe96aecf68f8e3 tags/v1.0.2
+git github.com/kr/pretty 71e7e49937503c662b9b636fd6b2c14b1aa818a5 heads/master
+git github.com/kr/text e2ffdb16a802fe2bb95e2e35ff34f0e53aeef34f tags/v0.1.0
+git github.com/mattn/go-isatty e1f7b56ace729e4a73a29a6b4fac6cd5fcda7ab3 tags/v0.0.9
+git github.com/miekg/dns c67445656579a3c3836047c509073f97022da0ed tags/v1.1.16
+git github.com/miekg/pkcs11 210dc1e16747c5ba98a03bcbcf728c38086ea357 tags/v1.0.3
 git github.com/namecoin/ncdns 19534f1dcfd1151bd9c072459caac12f6fb384df tags/v0.0.6
 git github.com/namecoin/pkcs11mod f7dce61fc5379851e99cfa2111834a29e3d36305 heads/master
 git github.com/ogier/pflag 45c278ab3607870051a2ea9040bb85fcb8557481 heads/master
@@ -23,6 +23,6 @@ git golang.org/x/net e0c57d8f86c17f0724497efcb3bc617e82834821 heads/master
 git gopkg.in/alecthomas/kingpin.v2 947dcec5ba9c011838740e680966fd7087a71d0d tags/v2.2.6
 git gopkg.in/hlandau/configurable.v1 34642c4c8cbf56801d0e34f0e82187305983ac26 heads/master
 git gopkg.in/hlandau/easyconfig.v1 c31249162931b4963bbe6e501cccb60d23271a3f tags/v1.0.17
-git gopkg.in/hlandau/madns.v1 b82ebc776bd8a13824350c7c108180d601e38352 tags/v1.0.7+
+git gopkg.in/hlandau/madns.v1 b82ebc776bd8a13824350c7c108180d601e38352 tags/v1.0.7
 git gopkg.in/hlandau/service.v2 b64b3467ebd16f64faec1640c25e318efc0c0d7b tags/v2.0.16
 git gopkg.in/hlandau/svcutils.v1 c25dac49e50cbbcbef8c81b089f56156f4067729 tags/v1.0.10
diff --git a/rbm.conf b/rbm.conf
index f1e3381..bc8f973 100644
--- a/rbm.conf
+++ b/rbm.conf
@@ -106,7 +106,6 @@ targets:
       deps:
         - build-essential
         - python
-        - bison
         - automake
         - libtool
         - zip
@@ -128,19 +127,30 @@ targets:
     var:
       android-x86: 1
       osname: android-x86
+  ncdns-android-aarch64:
+    - android-aarch64
+    - android
+  android-aarch64:
+    arch: aarch64
+    var:
+      android-aarch64: 1
+      osname: android-aarch64
   android:
     var:
       android: 1
       compiler: android-toolchain
       # API 16 is the minimum we currently support for Tor Browser on Android
-      android_min_api: 16
+      android_min_api: '[% GET c("var/android_min_api_" _ c("arch")) %]'
+      # API 21 is the minimum we currently support for arm64 on Android
+      android_min_api_aarch64: 21
+      android_min_api_armv7: 16
+      android_min_api_x86: 16
       container:
         suite: stretch
         arch: amd64
       deps:
         - build-essential
         - python
-        - bison
         - automake
         - libtool
         - zip
@@ -218,7 +228,7 @@ targets:
     var:
       windows: 1
       container:
-        suite: jessie
+        suite: stretch
       configure_opt: '--host=[% c("arch") %]-w64-mingw32 CFLAGS="[% c("var/CFLAGS") %]" LDFLAGS="[% c("var/LDFLAGS") %]"'
       CFLAGS: '-fstack-protector-strong -fno-strict-overflow -Wno-missing-field-initializers -Wformat -Wformat-security [% c("var/flag_mwindows") %]'
       LDFLAGS: '-Wl,--dynamicbase -Wl,--nxcompat -Wl,--enable-reloc-section -Wl,--no-insert-timestamp -lssp -L$gcclibs [% c("var/flag_HEASLR") %] [% c("var/flag_mwindows") %]'
@@ -241,16 +251,16 @@ targets:
       osx: 1
       osname: osx-x86_64
       container:
-        suite: jessie
+        suite: stretch
         arch: amd64
       compiler: 'macosx-toolchain'
       configure_opt: '--host=x86_64-apple-darwin11 CC="x86_64-apple-darwin11-clang [% c("var/FLAGS") %]" CXX="x86_64-apple-darwin11-clang++ [% c("var/FLAGS") %]"'
       FLAGS: "-target x86_64-apple-darwin11 -B $cctoolsdir -isysroot $sysrootdir"
       LDFLAGS: "-Wl,-syslibroot,$sysrootdir -Wl,-dead_strip -Wl,-pie"
+      macosx_deployment_target: '10.9'
       deps:
         - build-essential
         - python
-        - bison
         - automake
         - libtool
         - zip
diff --git a/tor-browser-build b/tor-browser-build
index 0fc15a3..9fde9fe 160000
--- a/tor-browser-build
+++ b/tor-browser-build
@@ -1 +1 @@
-Subproject commit 0fc15a39f2adcf029676810c2ec37c566886879e
+Subproject commit 9fde9fe3b38b8785d08ea0d1fc291ac0c266ed04