remove obfsproxy, update obfsclient

2014-04-24 12:29:49 -04:00 · 2014-04-24 12:29:49 -04:00 · 4d3754bbb2
parent 7af85b5cc3
commit 4d3754bbb2
3 changed files with 1 additions and 21 deletions
--- a/external/obfsclient
+++ b/external/obfsclient
@ -1 +1 @@
-Subproject commit 81d8c2da9864bafc249aa4a058426ef982a61ac3
+Subproject commit c91f7bbf3e0eedb080319ba3cfed7b47597b5aeb
--- a/external/obfsproxy
+++ b/external/obfsproxy
@ -1 +0,0 @@
-Subproject commit 94ebc4c3edf1e3e5f313444e59981ac557578df5
--- a/external/obfsproxy_android_no_hardening.patch
+++ b/external/obfsproxy_android_no_hardening.patch
@ -1,19 +0,0 @@
-commit d42eec7683ce9d47fc846e511e815ec1b2950c27
-Author: n8fr8 <nathan@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 ###
-
				`@ -1 +0,0 @@`
				`Subproject commit 94ebc4c3edf1e3e5f313444e59981ac557578df5`