From 475dc389246934e2df52ad90591c6d756c30f1e9 Mon Sep 17 00:00:00 2001
From: Christian Pointner <equinox@anytun.org>
Date: Fri, 8 Jun 2018 19:52:42 +0200
Subject: merge changelog with release branch

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

diff --git a/ChangeLog b/ChangeLog
index 67c50c4..25b0e44 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,12 @@
 
 * added RAIL mode
 
+2018.06.08 -- version 0.3.7
+
+* fixed some off-by-one errors using snprintf
+* add support for OpenSSL 1.1.0
+  (Thanks to Eneas U de Queiroz <cote2004-github@yahoo.com>)
+
 2017.01.04 -- Version 0.3.6
 
 * moved to GIT
-- 
cgit v1.2.3