From 04141464dd0fba90ace9aa6f7003ce139b888a40 Mon Sep 17 00:00:00 2001
From: Timothy J Fontaine <tjfontaine@gmail.com>
Date: Wed, 11 Dec 2013 20:21:57 -0800
Subject: [PATCH 1/2] 2013.12.13, Version 0.10.20 (Stable)

Changes since version 0.10.19:

* linux: fix up SO_REUSEPORT back-port (Ben Noordhuis)

* fs-event: fix invalid memory access (huxingyi)
---
 .mailmap      | 1 +
 AUTHORS       | 2 ++
 ChangeLog     | 9 +++++++++
 src/version.c | 2 +-
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.mailmap b/.mailmap
index 5dc4075e..9975da08 100644
--- a/.mailmap
+++ b/.mailmap
@@ -6,6 +6,7 @@ Brian White <mscdex@mscdex.net>
 Brian White <mscdex@mscdex.net> <mscdex@gmail.com>
 Frank Denis <github@pureftpd.org>
 Isaac Z. Schlueter <i@izs.me>
+Marc Schlaich <marc.schlaich@googlemail.com> <marc.schlaich@gmail.com>
 Robert Mustacchi <rm@joyent.com> <rm@fingolfin.org>
 Ryan Dahl <ryan@joyent.com> <ry@tinyclouds.org>
 Ryan Emery <seebees@gmail.com>
diff --git a/AUTHORS b/AUTHORS
index 32631467..4d0968e4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -87,3 +87,5 @@ Wynn Wilkes <wynnw@movenetworks.com>
 Andrei Sedoi <bsnote@gmail.com>
 Chris Bank <cbank@adobe.com>
 Geert Jansen <geertj@gmail.com>
+Alex Gaynor <alex.gaynor@gmail.com>
+huxingyi <huxingyi@msn.com>
diff --git a/ChangeLog b/ChangeLog
index b4e9099b..80908700 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2013.12.13, Version 0.10.20 (Stable)
+
+Changes since version 0.10.19:
+
+* linux: fix up SO_REUSEPORT back-port (Ben Noordhuis)
+
+* fs-event: fix invalid memory access (huxingyi)
+
+
 2013.11.13, Version 0.10.19 (Stable), 33959f7524090b8d2c6c41e2400ca77e31755059
 
 Changes since version 0.10.18:
diff --git a/src/version.c b/src/version.c
index ef5cf14d..252101eb 100644
--- a/src/version.c
+++ b/src/version.c
@@ -35,7 +35,7 @@
 #define UV_VERSION_MAJOR 0
 #define UV_VERSION_MINOR 10
 #define UV_VERSION_PATCH 20
-#define UV_VERSION_IS_RELEASE 0
+#define UV_VERSION_IS_RELEASE 1
 
 
 #define UV_VERSION  ((UV_VERSION_MAJOR << 16) | \

From f3d311edc447cfe0a95c6ca7cbe8301588f180c5 Mon Sep 17 00:00:00 2001
From: Timothy J Fontaine <tjfontaine@gmail.com>
Date: Wed, 11 Dec 2013 20:22:00 -0800
Subject: [PATCH 2/2] Now working on v0.10.21

---
 ChangeLog     | 2 +-
 src/version.c | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 80908700..0eacb25e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2013.12.13, Version 0.10.20 (Stable)
+2013.12.13, Version 0.10.20 (Stable), 04141464dd0fba90ace9aa6f7003ce139b888a40
 
 Changes since version 0.10.19:
 
diff --git a/src/version.c b/src/version.c
index 252101eb..0309db00 100644
--- a/src/version.c
+++ b/src/version.c
@@ -34,8 +34,8 @@
 
 #define UV_VERSION_MAJOR 0
 #define UV_VERSION_MINOR 10
-#define UV_VERSION_PATCH 20
-#define UV_VERSION_IS_RELEASE 1
+#define UV_VERSION_PATCH 21
+#define UV_VERSION_IS_RELEASE 0
 
 
 #define UV_VERSION  ((UV_VERSION_MAJOR << 16) | \