From 8e14ed44ad6ac76fd22e5d454824663f4a5f175f Mon Sep 17 00:00:00 2001
From: Yawning Angel <yawning@schwanenlied.me>
Date: Mon, 12 May 2014 00:02:24 +0000
Subject: 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.
---
 .gitignore | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to '.gitignore')

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
-- 
cgit v1.2.3