From 289467923bbdff3ae2b7636db6ee4c82a4d076c3 Mon Sep 17 00:00:00 2001
From: clowwindy <clowwindy42@gmail.com>
Date: Sat, 10 May 2014 01:13:18 +0800
Subject: [PATCH] bump

---
 CHANGES   | 3 +++
 README.md | 2 +-
 setup.py  | 2 +-
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CHANGES b/CHANGES
index 471192d..c771505 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,6 @@
+1.4.2 2014-05-10
+- Add salsa20 cipher
+
 1.4.1 2014-05-03
 - Fix error log
 - Fix EINPROGESS with some version of gevent
diff --git a/README.md b/README.md
index 356bc57..23b206a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 shadowsocks
 ===========
 
-Current version: 1.4.1 [![Build Status][1]][0]
+Current version: 1.4.2 [![Build Status][1]][0]
 
 shadowsocks is a lightweight tunnel proxy which can help you get through firewalls.
 
diff --git a/setup.py b/setup.py
index 7d2328b..3193fa9 100644
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ with open('README.rst') as f:
 
 setup(
     name="shadowsocks",
-    version="1.4.1",
+    version="1.4.2",
     license='MIT',
     description="a lightweight tunnel proxy",
     author='clowwindy',