commit 4163fc14d758cbcb110de2b4871a57efaa987bce Merge: fa533e9 d5e937d Author: Nathan Freitas nathan@freitas.net Date: Mon May 11 15:44:29 2015 -0400

Merge branch 'build_system' of https://github.com/aelmahmoudy/orbot into aelmahmoudy-build_system

external/Makefile | 61 +++++++++++++++++++++++++++++++++++++-------- external/libevent-patch-1 | 29 +++++++++++++++++++++ external/openssl | 2 +- 3 files changed, 81 insertions(+), 11 deletions(-)