Merge 2.12.0 into default

1 files changed, 50 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index 7a4370fc94..8c919983f9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -105,7 +105,49 @@ version 3.0.0 (??/??/????):
 	* A single yahoo plugin provides both Yahoo and Yahoo JAPAN protocols.
 
 
-version 2.11.0 (06/21/16):
+version 2.12.0 (03/09/2017):
+	libpurple:
+	* Fix an out of bounds memory read in purple_markup_unescape_entity.
+	  CVE-2017-2640
+	* Fix use of uninitialised memory if running non-debug-enabled versions of glib
+	* Updated AIM dev and dist ID's to new ones that were assigned by AOL.
+	* TLS certificate verification now uses SHA-256 checksums.
+	* Fixed SASL external auth for Freenode.
+	* Removed the MSN protocol plugin. It has been unusable and dormant for some
+	  time. MSNP18 has been discontinued and the protocol plugin would require a
+	  large update to start working again. See: http://ismsndeadyet.com/ The
+	  third-party Pidgin SkypeWeb plugin, however, should provide enough
+	  functionality as a replacement if people still want to use MSN:
+	  https://github.com/EionRobb/skype4pidgin/tree/master/skypeweb
+	* Removed Mxit protocol plugin. The service was closed at the end of
+	  September 2016. See
+	  https://pidgin.im/pipermail/devel/2016-September/024078.htm
+	* Removed the MySpaceIM protocol plugin. The service has been defunct for a
+	  long time. (#15356)
+	* Remove the Yahoo! protocol plugin. Yahoo has completely
+	  reimplemented their protocol, so this version is no longer operable as
+	  of August 5th, 2016:
+	  https://yahoo.tumblr.com/post/145715934739/q2-2016-progress-report-on-our-product
+	  A new protocol plugin has been written to support the new protocol.
+	  It can be found here: https://github.com/EionRobb/funyahoo-plusplus
+	  This also removes support for Yahoo! Japan. According to
+	  http://messenger.yahoo.co.jp/ the service ended March 26th, 2014.
+	* Remove the Facebook (XMPP) account option. According to
+	  https://developers.facebook.com/docs/chat the XMPP Chat API service
+	  ended April 30th, 2015. A new protocol plugin has been written,
+	  using a different method, to support Facebook. It can be found at
+	  https://github.com/dequis/purple-facebook/wiki
+	* Fixed gnutls certificate validation errors that mainly affected google (Dequis)
+
+	General
+	* Replaced instances of d.pidgin.im with developer.pidgin.im and updated the
+	  urls to use https. (#17036)
+
+	IRC
+	* Fixed issue of messages being silently cut off at 500 characters. Large
+	  messages are now split into parts and sent one by one. (#4753)
+
+version 2.11.0 (06/21/2016):
 	General:
 	* 2.10.12 was accidentally released with new additions to the API and
 	  should have been released as 2.11.0.  Unfortunately, we did not catch
@@ -128,14 +170,14 @@ version 2.11.0 (06/21/16):
 	  don't support rich text
 	* Fix a potential crash while exiting pidgin
 
-	AIM:
-	* Add support for the newer kerberos-based authentication of AIM 8.x
-
 	Windows-Specific Changes:
 	* Use getaddrinfo for DNS to enable IPv6 (#1075)
 	* Updates to dependencies:
 		* NSS 3.24 and NSPR 4.12.
 
+	AIM:
+	* Add support for the newer kerberos-based authentication of AIM 8.x
+
 	Bonjour
 	* Fixed building on Mac OSX (Patrick Cloke) (#16883)
 
@@ -180,7 +222,7 @@ version 2.11.0 (06/21/16):
 	* Fix a remote out-of-bounds read.  Discovered by Yves Younan of Cisco
 	  Talos.  (TALOS-CAN-0143)
 
-version 2.10.12 (12/31/15):
+version 2.10.12 (12/31/2015):
 	General:
 	* purple-url-handler now works with Python 3.x (Daniël van Eeden)
 	* Fixed an issue where transient startup statuses could be deleted
@@ -201,7 +243,7 @@ version 2.10.12 (12/31/15):
 	Gadu-Gadu:
 	* Updated internal libgadu to version 1.12.1.
 
-version 2.10.11 (11/23/14):
+version 2.10.11 (11/23/2014):
 	General:
 	* Fix handling of Self-Signed SSL/TLS Certificates when using the NSS
 	  plugin (#16412)
@@ -219,7 +261,7 @@ version 2.10.11 (11/23/14):
 	* Fail early when buddy list is unavailable instead of wasting bandwidth
 	  endlessly re-trying.
 
-version 2.10.10 (10/22/14):
+version 2.10.10 (10/22/2014):
 	General:
 	* Check the basic constraints extension when validating SSL/TLS
 	  certificates. This fixes a security hole that allowed a malicious
@@ -466,7 +508,7 @@ version 2.10.7 (02/13/2013):
 	Yahoo!:
 	* Fix a double-free in profile/picture loading code. (Mihai Serban)
 	  (#15053)
-	* Fix retrieving server-side buddy aliases. (Catalin Salgu) (#15381)
+	* Fix retrieving server-side buddy aliases. (Catalin Salgau) (#15381)
 
 	Plugins:
 	* The Voice/Video Settings plugin supports using the sndio GStreamer