From 03c087db6d2a80234d1d5c0fadcc2b46b1d48925 Mon Sep 17 00:00:00 2001
From: noisyfox <timemanager.rick@gmail.com>
Date: Fri, 16 Dec 2016 12:37:10 +1100
Subject: [PATCH] Update CHANGES and bump version

---
 CHANGES                                                | 5 +++++
 shadowsocks-csharp/Controller/Service/UpdateChecker.cs | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/CHANGES b/CHANGES
index e9700363..1bc2a74e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,8 @@
+3.4.2 2016-12-16
+- Fix null ref in TCPRelay. (#940)
+- Bring Privoxy back. (#948)
+- Bug fixes and improvements.
+
 3.4.1 (pre-release) 2016-12-13
 - Fix crash if user input an invaild server address. (#933)
 - Fix ERR_TOO_MANY_REDIRECTS with http proxy. (#937)
diff --git a/shadowsocks-csharp/Controller/Service/UpdateChecker.cs b/shadowsocks-csharp/Controller/Service/UpdateChecker.cs
index 3a3b1110..6f121fba 100644
--- a/shadowsocks-csharp/Controller/Service/UpdateChecker.cs
+++ b/shadowsocks-csharp/Controller/Service/UpdateChecker.cs
@@ -24,7 +24,7 @@ namespace Shadowsocks.Controller
         public string LatestVersionLocalName;
         public event EventHandler CheckUpdateCompleted;
 
-        public const string Version = "3.4.1";
+        public const string Version = "3.4.2";
 
         private class CheckUpdateTimer : System.Timers.Timer
         {