[tor-commits] [orbot/master] remove obfsproxy, update obfsclient

[n8fr8 at torproject.org]

commit 4d3754bbb237ce53e27a4b181205737ea0f3a0b4
Author: Nathan Freitas <nathan at freitas.net>
Date:   Thu Apr 24 12:29:49 2014 -0400

    remove obfsproxy, update obfsclient
---
 external/obfsclient                           |    2 +-
 external/obfsproxy                            |    1 -
 external/obfsproxy_android_no_hardening.patch |   19 -------------------
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/external/obfsclient b/external/obfsclient
index 81d8c2d..c91f7bb 160000
--- a/external/obfsclient
+++ b/external/obfsclient
@@ -1 +1 @@
-Subproject commit 81d8c2da9864bafc249aa4a058426ef982a61ac3
+Subproject commit c91f7bbf3e0eedb080319ba3cfed7b47597b5aeb
diff --git a/external/obfsproxy b/external/obfsproxy
deleted file mode 160000
index 94ebc4c..0000000
--- a/external/obfsproxy
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 94ebc4c3edf1e3e5f313444e59981ac557578df5
diff --git a/external/obfsproxy_android_no_hardening.patch b/external/obfsproxy_android_no_hardening.patch
deleted file mode 100644
index 58425be..0000000
--- a/external/obfsproxy_android_no_hardening.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit d42eec7683ce9d47fc846e511e815ec1b2950c27
-Author: n8fr8 <nathan at freitas.net>
-Date:   Fri May 4 17:32:51 2012 -0400
-
-    remove hardening for android
-
-diff --git a/configure.ac b/configure.ac
-index facd3c6..ad405ea 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -24,7 +24,7 @@ AC_CHECK_HEADERS([sys/types.h])
- AC_CHECK_HEADERS([netinet/in.h])
- 
- ### Compiler Hardening ###
--AX_ENABLE_HARDENING
-+##AX_ENABLE_HARDENING
- 
- ### Libraries ###
-