From 8669a1ea50075a05d7f0f3b592748c76b44be10c Mon Sep 17 00:00:00 2001
From: Nick Mathewson <nickm@torproject.org>
Date: Tue, 24 Oct 2017 09:05:23 -0400
Subject: [PATCH] Warn that 025 will become deprecated next may.

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

diff --git a/ChangeLog b/ChangeLog
index 5f3bad008..753143415 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,10 @@ Changes in version 0.2.5.15 - 2017-10-0?
   Tor 0.2.5.15 backports a collection of bugfixes from later Tor release
   series. It also adds a new directory authority, Bastet.
 
+  Note: the Tor 0.2.5 series will no longer be supported after 1 May
+  2018. If you need a release with long-term support, please upgrade to
+  the 0.2.9 series. Otherwise, please upgrade to 0.3.1 or later.
+
   o Directory authority changes:
     - Add "Bastet" as a ninth directory authority to the default list.
       Closes ticket 23910.