diff --git a/tor/README.md b/tor/README.md
index af956b8..325afe1 100644
--- a/tor/README.md
+++ b/tor/README.md
@@ -1,5 +1,37 @@
 # Build processes
 
-We are now using [Briar's Tor Reproducer](https://code.briarproject.org/briar/tor-reproducer) to build our tor static binaries
+## Linux and Android
+
+We use [Briar's Tor Reproducer](https://code.briarproject.org/briar/tor-reproducer) to build our tor linux and android binaries. 
+
+```
+git clone https://code.briarproject.org/briar/tor-reproducer.git
+```
+
+Either edit the tor-versions.json or copy in the one from this directory
+
+```
+docker build --tag tor-reproducer:0.4.4.6 .
+mkdir output
+docker run tor-reproducer:0.4.4.6 ./build-tor.py 0.4.4.6
+docker ps -a
+docker cp 937d81a46c33:/opt/tor-reproducer/tor_arm_pie.zip tor-0.4.4.6-arm_pie.zip
+docker cp 937d81a46c33:/opt/tor-reproducer/tor_linux-x86_64.zip tor-0.4.4.6-linux-x86_64.zip
+```
+
+Where 937d81a46c33 is the container ID from `docker ps -a`.
+
+Cleanup with
+
+```
+docker container prune
+docker rmi tor-reproducer:0.4.4.6
+```
+
+## Windows
+
+For Window we are bundling the [Tor Windows Expert Bundle](https://www.torproject.org/download/tor/).
+
+## Historical
 
 Previously we used some scripts that have been moved to `oldscripts`. They did not generate correct android binaries.
diff --git a/tor/tor b/tor/tor
index 5f3d670..d772170 100755
Binary files a/tor/tor and b/tor/tor differ
diff --git a/tor/tor-0.4.4.6-arm_pie b/tor/tor-0.4.4.6-arm_pie
new file mode 100755
index 0000000..f1f19c7
Binary files /dev/null and b/tor/tor-0.4.4.6-arm_pie differ
diff --git a/tor/tor-0.4.4.6-arm_pie.zip b/tor/tor-0.4.4.6-arm_pie.zip
new file mode 100644
index 0000000..ee9d55f
Binary files /dev/null and b/tor/tor-0.4.4.6-arm_pie.zip differ
diff --git a/tor/tor-0.4.4.6-linux-x86_64 b/tor/tor-0.4.4.6-linux-x86_64
new file mode 100755
index 0000000..d772170
Binary files /dev/null and b/tor/tor-0.4.4.6-linux-x86_64 differ
diff --git a/tor/tor-0.4.4.6-linux-x86_64.zip b/tor/tor-0.4.4.6-linux-x86_64.zip
new file mode 100644
index 0000000..0e04bcb
Binary files /dev/null and b/tor/tor-0.4.4.6-linux-x86_64.zip differ
diff --git a/tor/tor-versions.json b/tor/tor-versions.json
new file mode 100644
index 0000000..f477a4b
--- /dev/null
+++ b/tor/tor-versions.json
@@ -0,0 +1,171 @@
+{
+ "0.4.4.6": {
+    "tor": "tor-0.4.4.6",
+    "libevent": "release-2.1.8-stable",
+    "openssl": "OpenSSL_1_0_2u",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.8",
+    "tor-android": "55791c108d4b732b1c12866e4db3b8b1fd826bf1",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    },
+    "timestamp": "201001010000.00"
+  },
+  
+"0.3.5.12": {
+    "tor": "tor-0.3.5.12",
+    "libevent": "release-2.1.8-stable",
+    "openssl": "OpenSSL_1_0_2u",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.8",
+    "tor-android": "55791c108d4b732b1c12866e4db3b8b1fd826bf1",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    },
+    "timestamp": "201001010000.00"
+  },
+  "0.3.5.11": {
+    "tor": "tor-0.3.5.11",
+    "libevent": "release-2.1.8-stable",
+    "openssl": "OpenSSL_1_0_2u",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.8",
+    "tor-android": "55791c108d4b732b1c12866e4db3b8b1fd826bf1",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    },
+    "timestamp": "201001010000.00"
+  },
+  "0.3.5.10": {
+    "tor": "tor-0.3.5.10",
+    "libevent": "release-2.1.8-stable",
+    "openssl": "OpenSSL_1_0_2u",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.8",
+    "tor-android": "55791c108d4b732b1c12866e4db3b8b1fd826bf1",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    }
+  },
+  "0.3.5.9": {
+    "tor": "tor-0.3.5.9",
+    "libevent": "release-2.1.8-stable",
+    "openssl": "OpenSSL_1_0_2q",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.8",
+    "tor-android": "55791c108d4b732b1c12866e4db3b8b1fd826bf1",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    }
+  },
+  "0.3.5.8-64": {
+    "tor": "tor-0.3.5.8",
+    "libevent": "release-2.1.8-stable",
+    "openssl": "OpenSSL_1_0_2q",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.8",
+    "tor-android": "55791c108d4b732b1c12866e4db3b8b1fd826bf1",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    }
+  },
+  "0.3.5.8": {
+    "tor": "tor-0.3.5.8",
+    "libevent": "release-2.1.8-stable",
+    "openssl": "OpenSSL_1_0_2q",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.8",
+    "tor-android": "8eb128aa63b97e139bc845a9426b406245770096",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    }
+  },
+  "0.3.5.7": {
+    "tor": "tor-0.3.5.7",
+    "libevent": "release-2.1.8-stable",
+    "openssl": "OpenSSL_1_0_2q",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.8",
+    "tor-android": "8eb128aa63b97e139bc845a9426b406245770096",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    }
+  },
+  "0.3.4.8": {
+    "tor": "tor-0.3.4.8",
+    "libevent": "release-2.0.22-stable",
+    "openssl": "OpenSSL_1_0_2p",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.5",
+    "tor-android": "fa1ed5505d20aae51cb4cceb51bd9c5164066259",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    }
+  },
+  "0.2.9.16": {
+    "tor": "tor-0.2.9.16",
+    "libevent": "release-2.0.22-stable",
+    "openssl": "OpenSSL_1_0_2o",
+    "xz": "v5.2.4",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.5",
+    "tor-android": "tor-android-binary-0.3.3.5-rc-3",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    }
+  },
+  "0.2.9.15": {
+    "tor": "tor-0.2.9.15",
+    "libevent": "release-2.0.22-stable",
+    "openssl": "OpenSSL_1_0_2o",
+    "xz": "v5.2.3",
+    "zlib": "v1.2.11",
+    "zstd": "v1.3.2",
+    "tor-android": "tor-android-binary-0.3.3.5-rc-3",
+    "tor_android_repo_url": "https://github.com/n8fr8/tor-android",
+    "ndk": {
+      "url": "https://dl.google.com/android/repository/android-ndk-r15c-linux-x86_64.zip",
+      "revision": "15.2.4203891",
+      "sha256": "f01788946733bf6294a36727b99366a18369904eb068a599dde8cca2c1d2ba3c"
+    }
+  }
+}