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

---
 tor-build-process.md | 26 +++++++++++++++-----------
 1 file changed, 15 insertions(+), 11 deletions(-)

diff --git a/tor-build-process.md b/tor-build-process.md
index f0a1d3a..d657ffd 100644
--- a/tor-build-process.md
+++ b/tor-build-process.md
@@ -2,14 +2,14 @@
 * `export ANDROID_NDK_HOME=/path/to/ndk`
 * `git clone https://git.torproject.org/orbot.git`
 * `cd orbot`
-* `git checkout 9097b79`
+* `git checkout e801eaa`
 * `git submodule update --init external/libevent external/openssl external/tor`
 * `cd external/libevent`
 * `git checkout release-2.0.22-stable` (or latest stable release)
 * `cd ../openssl`
-* `git checkout OpenSSL_1_0_2g` (or latest stable release)
+* `git checkout OpenSSL_1_0_2o` (or latest stable release)
 * `cd ../tor`
-* `git checkout tor-0.2.7.6` (or latest stable release)
+* `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'`
 * `cd ../..`
@@ -18,16 +18,18 @@ ARM binary with PIE (Android API version 16+):
 * `unset APP_ABI`
 * `unset NDK_PLATFORM_LEVEL`
 * `unset PIEFLAGS`
-* `make -C external clean tor`
+* `make -C external clean`
+* `make -C external tor`
 * `mv external/bin/tor .`
 * `strip tor` (requires binutils-multiarch)
 * `zip tor-arm-pie.zip tor`
 
-ARM binary without PIE (Android API version 9-15):
+ARM binary without PIE (Android API version 14-15):
 * `unset APP_ABI`
-* `export NDK_PLATFORM_LEVEL=9`
+* `export NDK_PLATFORM_LEVEL=14`
 * `export PIEFLAGS=`
-* `make -C external clean tor`
+* `make -C external clean`
+* `make -C external tor`
 * `mv external/bin/tor .`
 * `strip tor` (requires binutils-multiarch)
 * `zip tor-arm.zip tor`
@@ -36,16 +38,18 @@ x86 binary with PIE (Android API version 16+):
 * `export APP_ABI=x86`
 * `unset NDK_PLATFORM_LEVEL`
 * `unset PIEFLAGS`
-* `make -C external clean tor`
+* `make -C external clean`
+* `make -C external tor`
 * `mv external/bin/tor .`
 * `strip tor` (requires binutils-multiarch)
 * `zip tor-x86-pie.zip tor`
 
-x86 binary without PIE (Android API version 9-15):
+x86 binary without PIE (Android API version 14-15):
 * `export APP_ABI=x86`
-* `export NDK_PLATFORM_LEVEL=9`
+* `export NDK_PLATFORM_LEVEL=14`
 * `export PIEFLAGS=`
-* `make -C external clean tor`
+* `make -C external clean`
+* `make -C external tor`
 * `mv external/bin/tor .`
 * `strip tor` (requires binutils-multiarch)
 * `zip tor-x86.zip tor`