Some planned 1.1/2.0 features have already been implemented.

diff --git a/goals.mdwn b/goals.mdwn
index 19f02f5..57bffec 100644 (file)
--- a/goals.mdwn
+++ b/goals.mdwn
@@ -65,7 +65,7 @@ The 1.1 branch of tinc has been created as a stepping stone towards
 2.0. Only gradual changes to the source code are allowed, ensuring
 that the code is always in a mostly usable state. The protocol will
 stay compatible with that of the 1.0 branch. The following features
-are planned in this branch:
+are planned or are already implemented in this branch:
 
 **Replaceble cryptography backend**
 
@@ -93,16 +93,6 @@ in the tinc.conf files. It is desirable to have tinc manage the
 creation of control connections as well, so that the administrator
 does not have to do this manually anymore.
 
-**Deal with NAT**
-
-The 1.0 branch by default tries to exchange packets via UDP.
-However, if one or more peers are behind a NAT, and source ports
-might be changed or packets may not arrive at all, the
-administrator had to manually enable the TCPOnly option or use
-another workaround to get tinc to work. Tinc should be able to cope
-with altered source ports, and should detect whether or not packet
-exchange via UDP works at all, and if not fall back to TCP.
-
 **Automate setting up nodes**
 
 The tincctl utility should have a wizard-like interface that asks a few