From 91b049c5092f9cb6f24a987ccad4c145faa362a3 Mon Sep 17 00:00:00 2001
From: akwizgran <michael@briarproject.org>
Date: Fri, 30 Mar 2018 14:59:40 +0000
Subject: [PATCH] Update tor build process

---
 tor-build-process.md | 33 +++++++++++++--------------------
 1 file changed, 13 insertions(+), 20 deletions(-)

diff --git a/tor-build-process.md b/tor-build-process.md
index d657ffd..7a92bd1 100644
--- a/tor-build-process.md
+++ b/tor-build-process.md
@@ -1,55 +1,48 @@
-* Install the [Android NDK, revision 10e](http://developer.android.com/ndk/downloads/older_releases.html)
+* Install the [Android NDK](https://developer.android.com/ndk/downloads/)
 * `export ANDROID_NDK_HOME=/path/to/ndk`
-* `git clone https://git.torproject.org/orbot.git`
-* `cd orbot`
-* `git checkout e801eaa`
-* `git submodule update --init external/libevent external/openssl external/tor`
+* `git clone https://github.com/n8fr8/tor-android`
+* `cd tor-android`
+* `git submodule update --init`
 * `cd external/libevent`
 * `git checkout release-2.0.22-stable` (or latest stable release)
 * `cd ../openssl`
 * `git checkout OpenSSL_1_0_2o` (or latest stable release)
 * `cd ../tor`
-* `git checkout tor-0.2.9.9` (or latest stable release)
-* `patch -p1 < /path/to/briar/patches/tor.patch`
-* `git commit -a -m 'Applied hidden service performance patch'`
+* `git checkout tor-0.3.2.9` (or latest stable release)
 * `cd ../..`
 
 ARM binary with PIE (Android API version 16+):
 * `unset APP_ABI`
 * `unset NDK_PLATFORM_LEVEL`
 * `unset PIEFLAGS`
-* `make -C external clean`
-* `make -C external tor`
+* `make -C external clean tor`
 * `mv external/bin/tor .`
 * `strip tor` (requires binutils-multiarch)
-* `zip tor-arm-pie.zip tor`
+* `zip tor_arm_pie.zip tor`
 
 ARM binary without PIE (Android API version 14-15):
 * `unset APP_ABI`
 * `export NDK_PLATFORM_LEVEL=14`
 * `export PIEFLAGS=`
-* `make -C external clean`
-* `make -C external tor`
+* `make -C external clean tor`
 * `mv external/bin/tor .`
 * `strip tor` (requires binutils-multiarch)
-* `zip tor-arm.zip tor`
+* `zip tor_arm.zip tor`
 
 x86 binary with PIE (Android API version 16+):
 * `export APP_ABI=x86`
 * `unset NDK_PLATFORM_LEVEL`
 * `unset PIEFLAGS`
-* `make -C external clean`
-* `make -C external tor`
+* `make -C external clean tor`
 * `mv external/bin/tor .`
 * `strip tor` (requires binutils-multiarch)
-* `zip tor-x86-pie.zip tor`
+* `zip tor_x86_pie.zip tor`
 
 x86 binary without PIE (Android API version 14-15):
 * `export APP_ABI=x86`
 * `export NDK_PLATFORM_LEVEL=14`
 * `export PIEFLAGS=`
-* `make -C external clean`
-* `make -C external tor`
+* `make -C external clean tor`
 * `mv external/bin/tor .`
 * `strip tor` (requires binutils-multiarch)
-* `zip tor-x86.zip tor`
+* `zip tor_x86.zip tor`