From b8b6588dbe800df727c5f17b762c9cfe5dcd86be Mon Sep 17 00:00:00 2001
From: Bert Belder <bertbelder@gmail.com>
Date: Wed, 22 Jan 2014 20:30:26 +0100
Subject: [PATCH 1/3] Now working on v0.10.24

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

diff --git a/ChangeLog b/ChangeLog
index 13c4efcb..7c029ae8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,4 @@
-2014.01.23, Version 0.10.23 (Stable)
+2014.01.23, Version 0.10.23 (Stable), dbd218e699fec8be311d85e4788be9e28ae884f8
 
 Changes since version 0.10.22:
 
diff --git a/src/version.c b/src/version.c
index 028ff253..fcecb7a2 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 23
-#define UV_VERSION_IS_RELEASE 1
+#define UV_VERSION_PATCH 24
+#define UV_VERSION_IS_RELEASE 0
 
 
 #define UV_VERSION  ((UV_VERSION_MAJOR << 16) | \

From 7c8ff3bc2578bbba09ef3f460b8d0f1c16bcd03e Mon Sep 17 00:00:00 2001
From: Trevor Norris <trev.norris@gmail.com>
Date: Wed, 22 Jan 2014 12:16:06 -0800
Subject: [PATCH 2/3] linux: move sscanf() out of the assert()

If asserts are turned off then the sscanf() wouldn't have run, being
placed directly in the assert() itself.
---
 src/unix/linux-core.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
index 74294eb2..2e96d54b 100644
--- a/src/unix/linux-core.c
+++ b/src/unix/linux-core.c
@@ -602,7 +602,9 @@ static int read_times(unsigned int numcpus, uv_cpu_info_t* ci) {
     /* skip "cpu<num> " marker */
     {
       unsigned int n;
-      assert(sscanf(buf, "cpu%u ", &n) == 1);
+      int r = sscanf(buf, "cpu%u ", &n);
+      assert(r == 1);
+      (void) r;  // silence build warning
       for (len = sizeof("cpu0"); n /= 10; len++);
     }
 

From 3e2446d18db6ba2c16fa71530565a904aaca1fd2 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <fedor.indutny@gmail.com>
Date: Wed, 29 Jan 2014 17:01:35 +0400
Subject: [PATCH 3/3] linux: fix C99/C++ comment

---
 src/unix/linux-core.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/unix/linux-core.c b/src/unix/linux-core.c
index 2e96d54b..7a8fcd35 100644
--- a/src/unix/linux-core.c
+++ b/src/unix/linux-core.c
@@ -604,7 +604,7 @@ static int read_times(unsigned int numcpus, uv_cpu_info_t* ci) {
       unsigned int n;
       int r = sscanf(buf, "cpu%u ", &n);
       assert(r == 1);
-      (void) r;  // silence build warning
+      (void) r;  /* silence build warning */
       for (len = sizeof("cpu0"); n /= 10; len++);
     }