From 12db9b2fc50ccfc522a8a6ec38254105659279f0 Mon Sep 17 00:00:00 2001
From: OttoMao <ottomao@gmail.com>
Date: Thu, 18 Jun 2015 17:36:48 +0800
Subject: [PATCH] update version and changelog, ready to release v3.4.0

---
 CHANGELOG    | 6 +++++-
 package.json | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index e6d3e33..3749ad5 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,4 +1,8 @@
-27 Apr: anyproxy 3.3.1:
+18 June: anyproxy 3.4.0:
+
+    * release version 3.4.0
+
+27 Apr: anyproxy 3.4.0@beta:
 
     * optimize web server and web socket interface
 
diff --git a/package.json b/package.json
index c21d739..3588af2 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "anyproxy",
-  "version": "3.4.0-Beta2",
+  "version": "3.4.0",
   "description": "A fully configurable proxy in NodeJS, which can handle HTTPS requests perfectly.",
   "main": "proxy.js",
   "bin": {