From 7cefd60904ae827edd98d110dd5604bd8aacb619 Mon Sep 17 00:00:00 2001
From: Shuo Chen <chenshuo@chenshuo.com>
Date: Thu, 18 Jan 2018 00:03:19 -0800
Subject: [PATCH] v1.1.0

---
 ChangeLog | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/ChangeLog b/ChangeLog
index 7c6edd179..45fa0f0b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2018-01-18   Shuo Chen  <chenshuo@chenshuo.com>
+  * Fix race condition between Thread::tid() and Thread::start().
+  * Change protorpc format, add back package name. (Go does this since 1.2)
+  * examples/socks4a/tunnel.h stops reading if output buffer is full.
+  * Fixes for GCC 6/7
+  * Minor fixes by huntinux, liangshaocong, zhoudayang2, octocat_lee,
+  jack.xsuperman, ligewei, yqsy.
+  * Version 1.1.0
+
 2016-10-25   Shuo Chen  <chenshuo@chenshuo.com>
   * Last version in C++98/03, next version will use C++11
   * Add Travis CI