From: Sergey Matveev <stargrave@stargrave.org>
Date: Sun, 15 Mar 2015 16:07:46 +0000 (+0300)
Subject: Preparing for 2.2 release
X-Git-Tag: 2.2^2
X-Git-Url: http://www.git.cypherpunks.ru/?p=govpn.git;a=commitdiff_plain;h=f2b56249ac73915de585e61db53dc1d080a5589e

Preparing for 2.2 release

Signed-off-by: Sergey Matveev <stargrave@stargrave.org>
---

diff --git a/NEWS b/NEWS
index b56beac..4500296 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+Release 2.2
+-----------
+* Fixed several possible channel deadlocks.
+
 Release 2.1
 -----------
 * Fixed Linux-related building.
diff --git a/doc/download.texi b/doc/download.texi
index d2ad657..e0ae00d 100644
--- a/doc/download.texi
+++ b/doc/download.texi
@@ -8,8 +8,8 @@ or by downloading prepared tarballs below.
 @tab @url{download/govpn-1.5.tar.xz, link} @url{download/govpn-1.5.tar.xz.sig, sign}
 @item 2.0 @tab 31 KiB
 @tab @url{download/govpn-2.0.tar.xz, link} @url{download/govpn-2.0.tar.xz.sig, sign}
-@item 2.1 @tab 32 KiB
-@tab @url{download/govpn-2.1.tar.xz, link} @url{download/govpn-2.1.tar.xz.sig, sign}
+@item 2.2 @tab 32 KiB
+@tab @url{download/govpn-2.2.tar.xz, link} @url{download/govpn-2.2.tar.xz.sig, sign}
 @end multitable
 
 Sourceforge.net also provides mirror for the files above:
diff --git a/makefile b/makefile
index b1e4229..59f148e 100644
--- a/makefile
+++ b/makefile
@@ -1,6 +1,6 @@
 .PHONY: govpn-client govpn-server
 
-VERSION=2.0
+VERSION=2.2
 LDFLAGS=-X govpn.Version $(VERSION)
 
 all: govpn-client govpn-server