From d103199ae6716671f254ecec383b21c8f5500a3a Mon Sep 17 00:00:00 2001
From: Erik Ekman <erik@kryo.se>
Date: Tue, 17 Jun 2014 19:02:01 +0200
Subject: [PATCH] Update versions to 0.6.0

---
 CHANGELOG     | 2 +-
 src/iodine.c  | 2 +-
 src/iodined.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index ab01d78..e41548d 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,7 +3,7 @@ iodine - http://code.kryo.se/iodine
 
 ***********************************
 
-CHANGES:
+CHANGES FOR 0.6 BRANCH:
 
 2014-06-17: 0.6.0
 	- Fix authentication bypass vulnerability; found by Oscar Reparaz.
diff --git a/src/iodine.c b/src/iodine.c
index 03efb18..f973ff5 100644
--- a/src/iodine.c
+++ b/src/iodine.c
@@ -102,7 +102,7 @@ help() {
 static void
 version() {
 	fprintf(stderr, "iodine IP over DNS tunneling client\n");
-	fprintf(stderr, "version: 0.6.0-rc1 from 2010-02-13\n");
+	fprintf(stderr, "version: 0.6.0 from 2014-06-17\n");
 
 	exit(0);
 }
diff --git a/src/iodined.c b/src/iodined.c
index b05ff57..7f351c3 100644
--- a/src/iodined.c
+++ b/src/iodined.c
@@ -2187,7 +2187,7 @@ help() {
 static void
 version() {
 	fprintf(stderr, "iodine IP over DNS tunneling server\n");
-	fprintf(stderr, "version: 0.6.0-rc1 from 2010-02-13\n");
+	fprintf(stderr, "version: 0.6.0 from 2014-06-17\n");
 	exit(0);
 }