# HG changeset patch
# User Ethan Blanton <elb@pidgin.im>
# Date 1317753285 0
# Node ID 952120a8ee023ed98967043111827ee3f515d962
# Parent  714e25ef2550e88d93c3b6283974bd63fd1033f2# Parent  81d3c4d2eb731a3e84cfd1adbe00077fd6aec3c8
merge of '0b7caf6b17815fe333d151369f26330d4c662bda'
     and 'efec3dc757b27366c8b23ca5c0bf1d8605084798'

diff -r 714e25ef2550 -r 952120a8ee02 ChangeLog
--- a/ChangeLog	Sat Oct 01 23:29:40 2011 +0000
+++ b/ChangeLog	Tue Oct 04 18:34:45 2011 +0000
@@ -1,5 +1,11 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+version 2.10.1 (??/??/????):
+	SILC:
+	* Fix CVE-2011-3594, by UTF-8 validating incoming messages before
+	  passing them to glib or libpurple.  Identified by Diego Bauche
+	  Madero from IOActive.  (#14636)
+
 version 2.10.0 (08/18/2011):
 	Pidgin:
 	* Make the max size of incoming smileys a pref instead of hardcoding it.