summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorYawning Angel <yawning@schwanenlied.me>2014-05-12 00:02:24 +0000
committerYawning Angel <yawning@schwanenlied.me>2014-05-12 00:02:24 +0000
commit8e14ed44ad6ac76fd22e5d454824663f4a5f175f (patch)
tree98a4dd5e2fab4bf4471baa9f960fc6f6cb7bdc32 /.gitignore
parentf76f142340260a6537c92439d173a9b324c12bd7 (diff)
Move to a unified client/server binary, and fix bugs.
* The old and the busted: obfs4-[client,server]. * The new hotness: obfs4client. * Add obfs4.ServerHandshake() that servers need to call after a successful return from Accept(). This allows implementations to move the handshake into a goroutine or whatever.
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore3
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index 5eac799..8251683 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,4 @@
*.swp
*~
-obfs4-client/obfs4-client
-obfs4-server/obfs4-server
+obfs4proxy/obfs4proxy