From d201613b477106ba85e32845542d5f73163fe5d5 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Sun, 29 Jun 2014 15:53:21 +0000
Subject: merged trunk changes to rail branch

---
 ChangeLog | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

diff --git a/ChangeLog b/ChangeLog
index 4022f95..18ad3b8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,7 +2,12 @@
 
 * added RAIL mode
 
-2014.06.08 -- Version 0.3.5
+2014.06.21 -- Version 0.3.5
+
+* added support for libnettle as crypt library
+* added an exception to the license which allows linking with OpenSSL
+
+2014.06.08 -- Version 0.3.4
 
 * fixed build issues for clang
 * refactored the multi socket support
-- 
cgit v1.2.3